From 43a97878ce14b72f0981164f87f2e35e14151312 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Sun, 7 Apr 2024 11:22:09 +0200 Subject: Adding upstream version 110.0.1. Signed-off-by: Daniel Baumann --- .../android/config/mozconfigs/android-x86_64/beta | 10 +++++++ .../android/config/mozconfigs/android-x86_64/debug | 13 +++++++++ .../config/mozconfigs/android-x86_64/debug-beta | 13 +++++++++ .../config/mozconfigs/android-x86_64/debug-fuzzing | 11 ++++++++ .../mozconfigs/android-x86_64/debug-fuzzing-lite | 5 ++++ .../android-x86_64/debug-isolated-process | 15 ++++++++++ .../config/mozconfigs/android-x86_64/debug-lite | 7 +++++ .../config/mozconfigs/android-x86_64/l10n-nightly | 23 ++++++++++++++++ .../mozconfigs/android-x86_64/l10n-nightly-lite | 7 +++++ .../config/mozconfigs/android-x86_64/nightly | 10 +++++++ .../mozconfigs/android-x86_64/nightly-artifact | 12 ++++++++ .../android-x86_64/nightly-artifact-lite | 12 ++++++++ .../mozconfigs/android-x86_64/nightly-fuzzing-asan | 32 ++++++++++++++++++++++ .../android-x86_64/nightly-fuzzing-asan-lite | 5 ++++ .../config/mozconfigs/android-x86_64/nightly-lite | 7 +++++ .../mozconfigs/android-x86_64/profile-generate | 6 ++++ 16 files changed, 188 insertions(+) create mode 100644 mobile/android/config/mozconfigs/android-x86_64/beta create mode 100644 mobile/android/config/mozconfigs/android-x86_64/debug create mode 100644 mobile/android/config/mozconfigs/android-x86_64/debug-beta create mode 100644 mobile/android/config/mozconfigs/android-x86_64/debug-fuzzing create mode 100644 mobile/android/config/mozconfigs/android-x86_64/debug-fuzzing-lite create mode 100644 mobile/android/config/mozconfigs/android-x86_64/debug-isolated-process create mode 100644 mobile/android/config/mozconfigs/android-x86_64/debug-lite create mode 100644 mobile/android/config/mozconfigs/android-x86_64/l10n-nightly create mode 100644 mobile/android/config/mozconfigs/android-x86_64/l10n-nightly-lite create mode 100644 mobile/android/config/mozconfigs/android-x86_64/nightly create mode 100644 mobile/android/config/mozconfigs/android-x86_64/nightly-artifact create mode 100644 mobile/android/config/mozconfigs/android-x86_64/nightly-artifact-lite create mode 100644 mobile/android/config/mozconfigs/android-x86_64/nightly-fuzzing-asan create mode 100644 mobile/android/config/mozconfigs/android-x86_64/nightly-fuzzing-asan-lite create mode 100644 mobile/android/config/mozconfigs/android-x86_64/nightly-lite create mode 100644 mobile/android/config/mozconfigs/android-x86_64/profile-generate (limited to 'mobile/android/config/mozconfigs/android-x86_64') diff --git a/mobile/android/config/mozconfigs/android-x86_64/beta b/mobile/android/config/mozconfigs/android-x86_64/beta new file mode 100644 index 0000000000..43981a416f --- /dev/null +++ b/mobile/android/config/mozconfigs/android-x86_64/beta @@ -0,0 +1,10 @@ +. "$topsrcdir/mobile/android/config/mozconfigs/common" + +# Android +ac_add_options --target=x86_64-linux-android + +ac_add_options --with-branding=mobile/android/branding/beta + +export MOZILLA_OFFICIAL=1 + +. "$topsrcdir/mobile/android/config/mozconfigs/common.override" diff --git a/mobile/android/config/mozconfigs/android-x86_64/debug b/mobile/android/config/mozconfigs/android-x86_64/debug new file mode 100644 index 0000000000..cfd951ce9d --- /dev/null +++ b/mobile/android/config/mozconfigs/android-x86_64/debug @@ -0,0 +1,13 @@ +. "$topsrcdir/mobile/android/config/mozconfigs/common" + +# Global options +ac_add_options --enable-debug + +# Android +ac_add_options --target=x86_64-linux-android + +export MOZILLA_OFFICIAL=1 + +ac_add_options --with-branding=mobile/android/branding/nightly + +. "$topsrcdir/mobile/android/config/mozconfigs/common.override" diff --git a/mobile/android/config/mozconfigs/android-x86_64/debug-beta b/mobile/android/config/mozconfigs/android-x86_64/debug-beta new file mode 100644 index 0000000000..be4f930022 --- /dev/null +++ b/mobile/android/config/mozconfigs/android-x86_64/debug-beta @@ -0,0 +1,13 @@ +. "$topsrcdir/mobile/android/config/mozconfigs/common" + +# Global options +ac_add_options --enable-debug + +# Android +ac_add_options --target=x86_64-linux-android + +export MOZILLA_OFFICIAL=1 + +ac_add_options --with-branding=mobile/android/branding/beta + +. "$topsrcdir/mobile/android/config/mozconfigs/common.override" diff --git a/mobile/android/config/mozconfigs/android-x86_64/debug-fuzzing b/mobile/android/config/mozconfigs/android-x86_64/debug-fuzzing new file mode 100644 index 0000000000..54cb818f5e --- /dev/null +++ b/mobile/android/config/mozconfigs/android-x86_64/debug-fuzzing @@ -0,0 +1,11 @@ +. "$topsrcdir/mobile/android/config/mozconfigs/android-x86_64/debug" + +# Disable Telemetry +ac_add_options MOZ_TELEMETRY_REPORTING= + +ac_add_options --enable-fuzzing + +# This adds '-fuzzing' to the APK filename for local builds. +export MOZ_PKG_SPECIAL=fuzzing + +. "$topsrcdir/mobile/android/config/mozconfigs/common.override" diff --git a/mobile/android/config/mozconfigs/android-x86_64/debug-fuzzing-lite b/mobile/android/config/mozconfigs/android-x86_64/debug-fuzzing-lite new file mode 100644 index 0000000000..4fc59444aa --- /dev/null +++ b/mobile/android/config/mozconfigs/android-x86_64/debug-fuzzing-lite @@ -0,0 +1,5 @@ +. "$topsrcdir/mobile/android/config/mozconfigs/android-x86_64/debug-lite" + +. "$topsrcdir/mobile/android/config/mozconfigs/android-x86_64/debug-fuzzing" + +. "$topsrcdir/mobile/android/config/mozconfigs/common.override" diff --git a/mobile/android/config/mozconfigs/android-x86_64/debug-isolated-process b/mobile/android/config/mozconfigs/android-x86_64/debug-isolated-process new file mode 100644 index 0000000000..c166becf72 --- /dev/null +++ b/mobile/android/config/mozconfigs/android-x86_64/debug-isolated-process @@ -0,0 +1,15 @@ +. "$topsrcdir/mobile/android/config/mozconfigs/common" + +# Global options +ac_add_options --enable-debug + +# Android +ac_add_options --with-android-min-sdk=21 +ac_add_options --target=x86_64-linux-android + +export MOZILLA_OFFICIAL=1 +export MOZ_ANDROID_CONTENT_SERVICE_ISOLATED_PROCESS=1 + +ac_add_options --with-branding=mobile/android/branding/nightly + +. "$topsrcdir/mobile/android/config/mozconfigs/common.override" \ No newline at end of file diff --git a/mobile/android/config/mozconfigs/android-x86_64/debug-lite b/mobile/android/config/mozconfigs/android-x86_64/debug-lite new file mode 100644 index 0000000000..ef97701075 --- /dev/null +++ b/mobile/android/config/mozconfigs/android-x86_64/debug-lite @@ -0,0 +1,7 @@ +. "$topsrcdir/mobile/android/config/mozconfigs/common" + +ac_add_options --enable-geckoview-lite + +. "$topsrcdir/mobile/android/config/mozconfigs/android-x86_64/debug" + +. "$topsrcdir/mobile/android/config/mozconfigs/common.override" diff --git a/mobile/android/config/mozconfigs/android-x86_64/l10n-nightly b/mobile/android/config/mozconfigs/android-x86_64/l10n-nightly new file mode 100644 index 0000000000..c9c6894790 --- /dev/null +++ b/mobile/android/config/mozconfigs/android-x86_64/l10n-nightly @@ -0,0 +1,23 @@ +NO_NDK=1 + +. "$topsrcdir/mobile/android/config/mozconfigs/common" + +. "$topsrcdir/mobile/android/config/mozconfigs/android-x86_64/nightly" + +# L10n + +# Don't autoclobber l10n, as this can lead to missing binaries and broken builds +# Bug 1283438 +mk_add_options AUTOCLOBBER= + +. "$topsrcdir/build/mozconfig.no-compile" + +# Global options +ac_add_options --disable-tests +ac_add_options --disable-nodejs +unset NODEJS + +ac_add_options --enable-updater +ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL} + +. "$topsrcdir/mobile/android/config/mozconfigs/common.override" diff --git a/mobile/android/config/mozconfigs/android-x86_64/l10n-nightly-lite b/mobile/android/config/mozconfigs/android-x86_64/l10n-nightly-lite new file mode 100644 index 0000000000..c39db1107d --- /dev/null +++ b/mobile/android/config/mozconfigs/android-x86_64/l10n-nightly-lite @@ -0,0 +1,7 @@ +. "$topsrcdir/mobile/android/config/mozconfigs/common" + +. "$topsrcdir/mobile/android/config/mozconfigs/android-x86_64/l10n-nightly" + +. "$topsrcdir/mobile/android/config/mozconfigs/android-x86_64/nightly-lite" + +. "$topsrcdir/mobile/android/config/mozconfigs/common.override" diff --git a/mobile/android/config/mozconfigs/android-x86_64/nightly b/mobile/android/config/mozconfigs/android-x86_64/nightly new file mode 100644 index 0000000000..457d93d4d3 --- /dev/null +++ b/mobile/android/config/mozconfigs/android-x86_64/nightly @@ -0,0 +1,10 @@ +. "$topsrcdir/mobile/android/config/mozconfigs/common" + +# Android +ac_add_options --target=x86_64-linux-android + +ac_add_options --with-branding=mobile/android/branding/nightly + +export MOZILLA_OFFICIAL=1 + +. "$topsrcdir/mobile/android/config/mozconfigs/common.override" diff --git a/mobile/android/config/mozconfigs/android-x86_64/nightly-artifact b/mobile/android/config/mozconfigs/android-x86_64/nightly-artifact new file mode 100644 index 0000000000..a56061dccd --- /dev/null +++ b/mobile/android/config/mozconfigs/android-x86_64/nightly-artifact @@ -0,0 +1,12 @@ +. "$topsrcdir/build/mozconfig.artifact.automation" + +NO_CACHE=1 +NO_NDK=1 + +. "$topsrcdir/mobile/android/config/mozconfigs/common" + +. "$topsrcdir/mobile/android/config/mozconfigs/android-x86_64/nightly" + +. "$topsrcdir/build/mozconfig.artifact" + +. "$topsrcdir/mobile/android/config/mozconfigs/common.override" diff --git a/mobile/android/config/mozconfigs/android-x86_64/nightly-artifact-lite b/mobile/android/config/mozconfigs/android-x86_64/nightly-artifact-lite new file mode 100644 index 0000000000..cc0918045c --- /dev/null +++ b/mobile/android/config/mozconfigs/android-x86_64/nightly-artifact-lite @@ -0,0 +1,12 @@ +. "$topsrcdir/build/mozconfig.artifact.automation" + +NO_CACHE=1 +NO_NDK=1 + +. "$topsrcdir/mobile/android/config/mozconfigs/common" + +. "$topsrcdir/mobile/android/config/mozconfigs/android-x86_64/nightly-lite" + +. "$topsrcdir/build/mozconfig.artifact" + +. "$topsrcdir/mobile/android/config/mozconfigs/common.override" diff --git a/mobile/android/config/mozconfigs/android-x86_64/nightly-fuzzing-asan b/mobile/android/config/mozconfigs/android-x86_64/nightly-fuzzing-asan new file mode 100644 index 0000000000..5399d5e842 --- /dev/null +++ b/mobile/android/config/mozconfigs/android-x86_64/nightly-fuzzing-asan @@ -0,0 +1,32 @@ +. "$topsrcdir/mobile/android/config/mozconfigs/android-x86_64/nightly" + +# Remove unwanted environment variables from the 'nightly' mozconfig. +unset MOZ_ANDROID_POCKET + +# We still need to build with debug symbols +ac_add_options --disable-debug +ac_add_options --enable-optimize="-O2 -gline-tables-only" + +# ASan specific options on Linux +ac_add_options --enable-valgrind + +. $topsrcdir/build/unix/mozconfig.asan +ac_add_options --disable-elf-hack + +ac_add_options --enable-fuzzing +unset MOZ_STDCXX_COMPAT +unset ENABLE_CLANG_PLUGIN + +# Add the path to the clang_rt used, so it can be packaged with the build. +if [ -d "$MOZ_FETCHES_DIR/clang" ]; then + CLANG_LIB_DIR="$(cd $MOZ_FETCHES_DIR/clang/lib/clang/*/lib/linux && pwd)" + export MOZ_CLANG_RT_ASAN_LIB_PATH="${CLANG_LIB_DIR}/libclang_rt.asan-x86_64-android.so" +fi + +# Package js shell. +export MOZ_PACKAGE_JSSHELL=1 + +# This adds '-fuzzing-asan' to the APK filename for local builds. +export MOZ_PKG_SPECIAL=fuzzing-asan + +. "$topsrcdir/mobile/android/config/mozconfigs/common.override" diff --git a/mobile/android/config/mozconfigs/android-x86_64/nightly-fuzzing-asan-lite b/mobile/android/config/mozconfigs/android-x86_64/nightly-fuzzing-asan-lite new file mode 100644 index 0000000000..beb35d13d8 --- /dev/null +++ b/mobile/android/config/mozconfigs/android-x86_64/nightly-fuzzing-asan-lite @@ -0,0 +1,5 @@ +. "$topsrcdir/mobile/android/config/mozconfigs/android-x86_64/nightly-lite" + +. "$topsrcdir/mobile/android/config/mozconfigs/android-x86_64/nightly-fuzzing-asan" + +. "$topsrcdir/mobile/android/config/mozconfigs/common.override" diff --git a/mobile/android/config/mozconfigs/android-x86_64/nightly-lite b/mobile/android/config/mozconfigs/android-x86_64/nightly-lite new file mode 100644 index 0000000000..abdb120300 --- /dev/null +++ b/mobile/android/config/mozconfigs/android-x86_64/nightly-lite @@ -0,0 +1,7 @@ +. "$topsrcdir/mobile/android/config/mozconfigs/common" + +ac_add_options --enable-geckoview-lite + +. "$topsrcdir/mobile/android/config/mozconfigs/android-x86_64/nightly" + +. "$topsrcdir/mobile/android/config/mozconfigs/common.override" diff --git a/mobile/android/config/mozconfigs/android-x86_64/profile-generate b/mobile/android/config/mozconfigs/android-x86_64/profile-generate new file mode 100644 index 0000000000..0bd9464da6 --- /dev/null +++ b/mobile/android/config/mozconfigs/android-x86_64/profile-generate @@ -0,0 +1,6 @@ +. "$topsrcdir/mobile/android/config/mozconfigs/android-x86_64/nightly" + +mk_add_options "export MOZ_AUTOMATION_PACKAGE_GENERATED_SOURCES=0" + +ac_add_options --enable-profile-generate=cross +ac_add_options --disable-tests -- cgit v1.2.3