diff options
author | Matt A. Tobin <email@mattatobin.com> | 2019-04-23 15:32:23 -0400 |
---|---|---|
committer | Matt A. Tobin <email@mattatobin.com> | 2019-04-23 15:32:23 -0400 |
commit | abe80cc31d5a40ebed743085011fbcda0c1a9a10 (patch) | |
tree | fb3762f06b84745b182af281abb107b95a9fcf01 /mobile/android/config/mozconfigs | |
parent | 63295d0087eb58a6eb34cad324c4c53d1b220491 (diff) | |
download | UXP-abe80cc31d5a40ebed743085011fbcda0c1a9a10.tar UXP-abe80cc31d5a40ebed743085011fbcda0c1a9a10.tar.gz UXP-abe80cc31d5a40ebed743085011fbcda0c1a9a10.tar.lz UXP-abe80cc31d5a40ebed743085011fbcda0c1a9a10.tar.xz UXP-abe80cc31d5a40ebed743085011fbcda0c1a9a10.zip |
Issue #1053 - Drop support Android and remove Fennec - Part 1a: Remove mobile/android
Diffstat (limited to 'mobile/android/config/mozconfigs')
16 files changed, 0 insertions, 432 deletions
diff --git a/mobile/android/config/mozconfigs/android-api-15-frontend/nightly b/mobile/android/config/mozconfigs/android-api-15-frontend/nightly deleted file mode 100644 index 6fb88b0f5..000000000 --- a/mobile/android/config/mozconfigs/android-api-15-frontend/nightly +++ /dev/null @@ -1,43 +0,0 @@ -# Many things aren't appropriate for a frontend-only build. -MOZ_AUTOMATION_BUILD_SYMBOLS=0 -MOZ_AUTOMATION_INSTALLER=0 -MOZ_AUTOMATION_L10N_CHECK=0 -MOZ_AUTOMATION_PACKAGE=0 -MOZ_AUTOMATION_PACKAGE_TESTS=0 -MOZ_AUTOMATION_SDK=0 -MOZ_AUTOMATION_UPDATE_PACKAGING=0 -MOZ_AUTOMATION_UPLOAD=0 -MOZ_AUTOMATION_UPLOAD_SYMBOLS=0 - -NO_CACHE=1 -NO_NDK=1 - -. "$topsrcdir/mobile/android/config/mozconfigs/common" - -ac_add_options --with-gradle="$topsrcdir/gradle-dist/bin/gradle" -export GRADLE_MAVEN_REPOSITORY="file://$topsrcdir/jcentral" - -unset HOST_CC -unset HOST_CXX - -ac_add_options --disable-compile-environment -ac_add_options --disable-tests - -# From here on, like ../android-api-15/nightly. - -ac_add_options --enable-profiling - -# Android -ac_add_options --with-android-min-sdk=15 -ac_add_options --target=arm-linux-androideabi - -ac_add_options --with-branding=mobile/android/branding/nightly - -# This will overwrite the default of stripping everything and keep the symbol table. -# This is useful for profiling with eideticker. See bug 788680 -STRIP_FLAGS="--strip-debug" - -export MOZILLA_OFFICIAL=1 -export MOZ_TELEMETRY_REPORTING=1 - -. "$topsrcdir/mobile/android/config/mozconfigs/common.override" diff --git a/mobile/android/config/mozconfigs/android-api-15-gradle-dependencies/nightly b/mobile/android/config/mozconfigs/android-api-15-gradle-dependencies/nightly deleted file mode 100644 index 99789543c..000000000 --- a/mobile/android/config/mozconfigs/android-api-15-gradle-dependencies/nightly +++ /dev/null @@ -1,45 +0,0 @@ -# Many things aren't appropriate for a frontend-only build. -MOZ_AUTOMATION_BUILD_SYMBOLS=0 -MOZ_AUTOMATION_INSTALLER=0 -MOZ_AUTOMATION_L10N_CHECK=0 -MOZ_AUTOMATION_PACKAGE=0 -MOZ_AUTOMATION_PACKAGE_TESTS=0 -MOZ_AUTOMATION_SDK=0 -MOZ_AUTOMATION_UPDATE_PACKAGING=0 -MOZ_AUTOMATION_UPLOAD=0 -MOZ_AUTOMATION_UPLOAD_SYMBOLS=0 - -NO_CACHE=1 -NO_NDK=1 - -. "$topsrcdir/mobile/android/config/mozconfigs/common" - -# We want to download Gradle. -ac_add_options --with-gradle -# We want to use (and populate!) the local Nexus repository. -export GRADLE_MAVEN_REPOSITORY="http://localhost:8081/nexus/content/repositories/central/" - -# From here on, just like ../android-api-15-frontend/nightly. - -ac_add_options --disable-compile-environment -unset HOST_CC -unset HOST_CXX - -ac_add_options --disable-tests - -ac_add_options --enable-profiling - -# Android -ac_add_options --with-android-min-sdk=15 -ac_add_options --target=arm-linux-androideabi - -ac_add_options --with-branding=mobile/android/branding/nightly - -# This will overwrite the default of stripping everything and keep the symbol table. -# This is useful for profiling with eideticker. See bug 788680 -STRIP_FLAGS="--strip-debug" - -export MOZILLA_OFFICIAL=1 -export MOZ_TELEMETRY_REPORTING=1 - -. "$topsrcdir/mobile/android/config/mozconfigs/common.override" diff --git a/mobile/android/config/mozconfigs/android-api-15-gradle/nightly b/mobile/android/config/mozconfigs/android-api-15-gradle/nightly deleted file mode 100644 index d1bca2d67..000000000 --- a/mobile/android/config/mozconfigs/android-api-15-gradle/nightly +++ /dev/null @@ -1,23 +0,0 @@ -. "$topsrcdir/mobile/android/config/mozconfigs/common" - -ac_add_options --enable-profiling - -# Android -ac_add_options --with-android-min-sdk=15 -ac_add_options --target=arm-linux-androideabi - -ac_add_options --with-branding=mobile/android/branding/nightly - -ac_add_options --with-gradle="$topsrcdir/gradle-dist/bin/gradle" -export GRADLE_MAVEN_REPOSITORY="file://$topsrcdir/jcentral" - -# From here on, just like ../android-api-15/nightly. - -# This will overwrite the default of stripping everything and keep the symbol table. -# This is useful for profiling with eideticker. See bug 788680 -STRIP_FLAGS="--strip-debug" - -export MOZILLA_OFFICIAL=1 -export MOZ_TELEMETRY_REPORTING=1 - -. "$topsrcdir/mobile/android/config/mozconfigs/common.override" diff --git a/mobile/android/config/mozconfigs/android-api-15/debug b/mobile/android/config/mozconfigs/android-api-15/debug deleted file mode 100644 index 90093edcb..000000000 --- a/mobile/android/config/mozconfigs/android-api-15/debug +++ /dev/null @@ -1,16 +0,0 @@ -. "$topsrcdir/mobile/android/config/mozconfigs/common" - -# Global options -ac_add_options --enable-debug -ENABLE_MARIONETTE=1 - -# Android -ac_add_options --with-android-min-sdk=15 -ac_add_options --target=arm-linux-androideabi - -export MOZILLA_OFFICIAL=1 -export MOZ_TELEMETRY_REPORTING=1 - -ac_add_options --with-branding=mobile/android/branding/official - -. "$topsrcdir/mobile/android/config/mozconfigs/common.override" diff --git a/mobile/android/config/mozconfigs/android-api-15/l10n-nightly b/mobile/android/config/mozconfigs/android-api-15/l10n-nightly deleted file mode 100644 index cdebcf174..000000000 --- a/mobile/android/config/mozconfigs/android-api-15/l10n-nightly +++ /dev/null @@ -1,27 +0,0 @@ -. "$topsrcdir/mobile/android/config/mozconfigs/common" - -# L10n -ac_add_options --with-l10n-base=.. - -# Global options -ac_add_options --disable-tests - -# Android -ac_add_options --with-android-min-sdk=15 -ac_add_options --target=arm-linux-androideabi - -ac_add_options --with-system-zlib -ac_add_options --enable-updater -ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL} - -export MOZILLA_OFFICIAL=1 - -ac_add_options --with-branding=mobile/android/branding/official - -ac_add_options --disable-stdcxx-compat - -# Don't autoclobber l10n, as this can lead to missing binaries and broken builds -# Bug 1283438 -mk_add_options AUTOCLOBBER= - -. "$topsrcdir/mobile/android/config/mozconfigs/common.override" diff --git a/mobile/android/config/mozconfigs/android-api-15/l10n-release b/mobile/android/config/mozconfigs/android-api-15/l10n-release deleted file mode 100644 index e72e3bb84..000000000 --- a/mobile/android/config/mozconfigs/android-api-15/l10n-release +++ /dev/null @@ -1,28 +0,0 @@ -. "$topsrcdir/mobile/android/config/mozconfigs/common" - -# L10n -ac_add_options --with-l10n-base=.. - -# Global options -ac_add_options --disable-tests - -# Android -ac_add_options --with-android-min-sdk=15 -ac_add_options --target=arm-linux-androideabi - -ac_add_options --with-system-zlib -ac_add_options --enable-updater -ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL} - -export MOZILLA_OFFICIAL=1 - -ac_add_options --enable-official-branding -ac_add_options --with-branding=mobile/android/branding/official - -ac_add_options --disable-stdcxx-compat - -# Don't autoclobber l10n, as this can lead to missing binaries and broken builds -# Bug 1283438 -mk_add_options AUTOCLOBBER= - -. "$topsrcdir/mobile/android/config/mozconfigs/common.override" diff --git a/mobile/android/config/mozconfigs/android-api-15/nightly b/mobile/android/config/mozconfigs/android-api-15/nightly deleted file mode 100644 index 0ad80cb8b..000000000 --- a/mobile/android/config/mozconfigs/android-api-15/nightly +++ /dev/null @@ -1,18 +0,0 @@ -. "$topsrcdir/mobile/android/config/mozconfigs/common" - - - -# Android -ac_add_options --with-android-min-sdk=15 -ac_add_options --target=arm-linux-androideabi - -ac_add_options --with-branding=mobile/android/branding/official - -# This will overwrite the default of stripping everything and keep the symbol table. -# This is useful for profiling with eideticker. See bug 788680 -STRIP_FLAGS="--strip-debug" - -export MOZILLA_OFFICIAL=1 -export MOZ_TELEMETRY_REPORTING=1 - -. "$topsrcdir/mobile/android/config/mozconfigs/common.override" diff --git a/mobile/android/config/mozconfigs/android-api-15/release b/mobile/android/config/mozconfigs/android-api-15/release deleted file mode 100644 index edb662825..000000000 --- a/mobile/android/config/mozconfigs/android-api-15/release +++ /dev/null @@ -1,16 +0,0 @@ -. "$topsrcdir/mobile/android/config/mozconfigs/common" - -# Android -ac_add_options --with-android-min-sdk=15 -ac_add_options --target=arm-linux-androideabi - -ac_add_options --with-branding=mobile/android/branding/official - -ac_add_options --enable-updater - -export MOZILLA_OFFICIAL=1 -export MOZ_TELEMETRY_REPORTING=1 - -ac_add_options --enable-official-branding - -. "$topsrcdir/mobile/android/config/mozconfigs/common.override" diff --git a/mobile/android/config/mozconfigs/android-x86/debug b/mobile/android/config/mozconfigs/android-x86/debug deleted file mode 100644 index e2d090f98..000000000 --- a/mobile/android/config/mozconfigs/android-x86/debug +++ /dev/null @@ -1,15 +0,0 @@ -. "$topsrcdir/mobile/android/config/mozconfigs/common" - -# Global options -ac_add_options --enable-debug - -# Android -ac_add_options --target=i386-linux-android -ac_add_options --with-android-min-sdk=15 - -export MOZILLA_OFFICIAL=1 -export MOZ_TELEMETRY_REPORTING=1 - -ac_add_options --with-branding=mobile/android/branding/official - -. "$topsrcdir/mobile/android/config/mozconfigs/common.override" diff --git a/mobile/android/config/mozconfigs/android-x86/l10n-nightly b/mobile/android/config/mozconfigs/android-x86/l10n-nightly deleted file mode 100644 index f725f2db1..000000000 --- a/mobile/android/config/mozconfigs/android-x86/l10n-nightly +++ /dev/null @@ -1,26 +0,0 @@ -. "$topsrcdir/mobile/android/config/mozconfigs/common" - -# L10n -ac_add_options --with-l10n-base=.. - -# Global options -ac_add_options --disable-tests - -# Android -ac_add_options --target=i386-linux-android -ac_add_options --with-android-min-sdk=15 - -ac_add_options --enable-updater -ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL} - -export MOZILLA_OFFICIAL=1 - -ac_add_options --with-branding=mobile/android/branding/official - -ac_add_options --disable-stdcxx-compat - -# Don't autoclobber l10n, as this can lead to missing binaries and broken builds -# Bug 1283438 -mk_add_options AUTOCLOBBER= - -. "$topsrcdir/mobile/android/config/mozconfigs/common.override" diff --git a/mobile/android/config/mozconfigs/android-x86/l10n-release b/mobile/android/config/mozconfigs/android-x86/l10n-release deleted file mode 100644 index 61f871f6d..000000000 --- a/mobile/android/config/mozconfigs/android-x86/l10n-release +++ /dev/null @@ -1,27 +0,0 @@ -. "$topsrcdir/mobile/android/config/mozconfigs/common" - -# L10n -ac_add_options --with-l10n-base=.. - -# Global options -ac_add_options --disable-tests - -# Android -ac_add_options --target=i386-linux-android -ac_add_options --with-android-min-sdk=15 - -ac_add_options --enable-updater -ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL} - -export MOZILLA_OFFICIAL=1 - -ac_add_options --enable-official-branding -ac_add_options --with-branding=mobile/android/branding/official - -ac_add_options --disable-stdcxx-compat - -# Don't autoclobber l10n, as this can lead to missing binaries and broken builds -# Bug 1283438 -mk_add_options AUTOCLOBBER= - -. "$topsrcdir/mobile/android/config/mozconfigs/common.override" diff --git a/mobile/android/config/mozconfigs/android-x86/nightly b/mobile/android/config/mozconfigs/android-x86/nightly deleted file mode 100644 index c2f73febb..000000000 --- a/mobile/android/config/mozconfigs/android-x86/nightly +++ /dev/null @@ -1,17 +0,0 @@ -. "$topsrcdir/mobile/android/config/mozconfigs/common" - -ac_add_options --target=i386-linux-android -ac_add_options --with-android-min-sdk=15 - - - -ac_add_options --with-branding=mobile/android/branding/official - -# This will overwrite the default of stripping everything and keep the symbol table. -# This is useful for profiling with eideticker. See bug 788680 -STRIP_FLAGS="--strip-debug" - -export MOZILLA_OFFICIAL=1 -export MOZ_TELEMETRY_REPORTING=1 - -. "$topsrcdir/mobile/android/config/mozconfigs/common.override" diff --git a/mobile/android/config/mozconfigs/android-x86/release b/mobile/android/config/mozconfigs/android-x86/release deleted file mode 100644 index 7622151c2..000000000 --- a/mobile/android/config/mozconfigs/android-x86/release +++ /dev/null @@ -1,16 +0,0 @@ -. "$topsrcdir/mobile/android/config/mozconfigs/common" - -# Android -ac_add_options --target=i386-linux-android -ac_add_options --with-android-min-sdk=15 - -ac_add_options --enable-updater - -ac_add_options --with-branding=mobile/android/branding/official - -export MOZILLA_OFFICIAL=1 -export MOZ_TELEMETRY_REPORTING=1 - -ac_add_options --enable-official-branding - -. "$topsrcdir/mobile/android/config/mozconfigs/common.override" diff --git a/mobile/android/config/mozconfigs/common b/mobile/android/config/mozconfigs/common deleted file mode 100644 index 1acb91ebb..000000000 --- a/mobile/android/config/mozconfigs/common +++ /dev/null @@ -1,83 +0,0 @@ -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. - -# This file is included at the top of all native android mozconfigs -if [ "x$IS_NIGHTLY" = "xyes" ]; then - MOZ_AUTOMATION_UPLOAD_SYMBOLS=${MOZ_AUTOMATION_UPLOAD_SYMBOLS-1} -fi - -MOZ_AUTOMATION_L10N_CHECK=0 -. "$topsrcdir/build/mozconfig.common" - -# In TaskCluster, the Java JRE/JDK are installed from tooltool, but that -# install doesn't work on the old Buildbot mock builders (CentOS 6.2), so -# the relevant env vars are not set up in that case, leaving the build to -# run from the JRE/JDK in /usr/lib/jvm. -if [ ! -f /etc/redhat-release ] || [ "$(< /etc/redhat-release)" != "CentOS release 6.2 (Final)" ]; then - # set JAVA_HOME to find the JRE/JDK from tooltool. Several scripts in the JDK - # assume `java` is in PATH, so set that too. To see how this tarball is built, - # see taskcluster/scripts/misc/repackage-jdk.sh - export JAVA_HOME="$topsrcdir/java_home" - export PATH="$PATH:$topsrcdir/java_home/bin" - - mk_add_options "export JAVA_HOME=$topsrcdir/java_home" - mk_add_options "export PATH=$PATH:$topsrcdir/java_home/bin" -fi - -ac_add_options --enable-elf-hack - -ANDROID_NDK_VERSION="r10e" -ANDROID_NDK_VERSION_32BIT="r8c" - -# Build Fennec -ac_add_options --enable-application=mobile/android -ac_add_options --with-android-sdk="$topsrcdir/android-sdk-linux" - -if [ -z "$NO_NDK" ]; then - ac_add_options --with-android-ndk="$topsrcdir/android-ndk" - ac_add_options --with-android-gnu-compiler-version=4.9 -fi - -ac_add_options --with-system-zlib -ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL} - -ac_add_options --with-mozilla-api-keyfile=/builds/mozilla-fennec-geoloc-api.key - -# MOZ_INSTALL_TRACKING does not guarantee MOZ_UPDATE_CHANNEL will be set so we -# provide a default state. Currently, the default state provides a default -# keyfile because an assertion will be thrown if MOZ_INSTALL_TRACKING is -# specified but a keyfile is not. This assertion can catch if we misconfigure a -# release or beta build and it does not have a valid keyfile. -# -# However, by providing a default keyfile, if we misconfigure beta or release, -# the default keyfile may be used instead and the assertion won't catch the -# error. Therefore, it would be ideal to have MOZ_INSTALL_TRACKING guarantee -# MOZ_UPDATE_CHANNEL was set so we can remove the default case. This may occur -# when release promotion is implemented on Android. -# -# In all cases, we don't upload Adjust pings in automation. -if test "$MOZ_UPDATE_CHANNEL" = "release" ; then - ac_add_options --with-adjust-sdk-keyfile=/builds/adjust-sdk.token -elif test "$MOZ_UPDATE_CHANNEL" = "beta" ; then - ac_add_options --with-adjust-sdk-keyfile=/builds/adjust-sdk-beta.token -else - ac_add_options --with-adjust-sdk-keyfile="$topsrcdir/mobile/android/base/adjust-sdk-sandbox.token" -fi -export SOCORRO_SYMBOL_UPLOAD_TOKEN_FILE=/builds/crash-stats-api.token - -# Package js shell. -export MOZ_PACKAGE_JSSHELL=1 - -# Use ccache -. "$topsrcdir/build/mozconfig.cache" - -HOST_CC="$topsrcdir/gcc/bin/gcc" -HOST_CXX="$topsrcdir/gcc/bin/g++" - -. "$topsrcdir/build/unix/mozconfig.stdcxx" - -# Use libc++ as our C++ standard library -ac_add_options --with-android-cxx-stl=libc++ - -JS_BINARY="$topsrcdir/mobile/android/config/js_wrapper.sh" diff --git a/mobile/android/config/mozconfigs/common.override b/mobile/android/config/mozconfigs/common.override deleted file mode 100644 index e2382d21e..000000000 --- a/mobile/android/config/mozconfigs/common.override +++ /dev/null @@ -1,11 +0,0 @@ -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. - -# This file is included at the bottom of all native android mozconfigs -# -# Disable enforcing that add-ons are signed by the trusted root -MOZ_REQUIRE_SIGNING=0 - -. "$topsrcdir/build/mozconfig.common.override" -. "$topsrcdir/build/mozconfig.cache" diff --git a/mobile/android/config/mozconfigs/public-partner/distribution_sample/mozconfig1 b/mobile/android/config/mozconfigs/public-partner/distribution_sample/mozconfig1 deleted file mode 100644 index b790769c6..000000000 --- a/mobile/android/config/mozconfigs/public-partner/distribution_sample/mozconfig1 +++ /dev/null @@ -1,21 +0,0 @@ -# currently a copy of mobile/android/config/mozconfigs/android-api-15/nightly -. "$topsrcdir/mobile/android/config/mozconfigs/common" - -ac_add_options --enable-profiling - -# Android -ac_add_options --with-android-min-sdk=15 -ac_add_options --target=arm-linux-androideabi - -ac_add_options --with-branding=mobile/android/branding/nightly - -ac_add_options --with-android-distribution-directory=/home/worker/workspace/build/partner - -# This will overwrite the default of stripping everything and keep the symbol table. -# This is useful for profiling with eideticker. See bug 788680 -STRIP_FLAGS="--strip-debug" - -export MOZILLA_OFFICIAL=1 -export MOZ_TELEMETRY_REPORTING=1 - -. "$topsrcdir/mobile/android/config/mozconfigs/common.override" |