[tor-commits] [tor-browser-build/master] Bug 40247: Remove projects/firefox/mozconfig-android-* files

gk at torproject.org gk at torproject.org
Fri Mar 5 14:44:53 UTC 2021 

commit 1859ae466eb8e0d6b522be042c6d159c1f585b06
Author: Nicolas Vigier <boklm at torproject.org>
Date:   Fri Mar 5 14:23:45 2021 +0100

    Bug 40247: Remove projects/firefox/mozconfig-android-* files
    
    projects/firefox is no longer used in Android builds (projects/geckoview
    is now used instead), so those mozconfig-android-* files are not needed
    anymore.
---
 projects/firefox/mozconfig-android-aarch64 | 50 -----------------------------
 projects/firefox/mozconfig-android-armv7   | 50 -----------------------------
 projects/firefox/mozconfig-android-x86     | 50 -----------------------------
 projects/firefox/mozconfig-android-x86_64  | 51 ------------------------------
 4 files changed, 201 deletions(-)

diff --git a/projects/firefox/mozconfig-android-aarch64 b/projects/firefox/mozconfig-android-aarch64
deleted file mode 100644
index fd86f23..0000000
--- a/projects/firefox/mozconfig-android-aarch64
+++ /dev/null
@@ -1,50 +0,0 @@
-mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj-aarch64-linux-android
-mk_add_options MOZ_APP_DISPLAYNAME="Tor Browser"
-export MOZILLA_OFFICIAL=1
-CC="clang"
-CXX="clang++"
-
-ac_add_options --with-android-min-sdk=21
-
-ac_add_options --enable-optimize
-ac_add_options --enable-official-branding
-
-ac_add_options --enable-application=mobile/android
-ac_add_options --target=aarch64-linux-android
-ac_add_options --with-android-ndk=/var/tmp/dist/android-toolchain/android-ndk
-ac_add_options --with-android-sdk=/var/tmp/dist/android-toolchain/android-sdk-linux
-ac_add_options --with-gradle=/var/tmp/dist/android-toolchain/gradle/gradle-4.10.2/bin/gradle
-
-ac_add_options --with-android-distribution-directory=@TOPSRCDIR@/mobile/android/torbrowser
-ac_add_options --with-l10n-base=/var/tmp/dist/locales
-
-# We do not use Tor Launcher on Android:
-ac_add_options --disable-tor-launcher
-
-if [ -z "${TB_BUILD_WITH_UPDATER}" ]; then
-# Because Google Play will likely be the primary distribution medium,
-# we disable updating and rely on Google Play by default. The
-# Developer Policy explicitly prohibits in-app updating:
-#    An app distributed via Google Play may not modify, replace, or
-#    update itself using any method other than Google Plays update
-#    mechanism.
-# https://play.google.com/about/privacy-security-deception/malicious-behavior/
-
-    ac_add_options --disable-tor-browser-update
-    ac_add_options --disable-signmar
-    ac_add_options --disable-verify-mar
-fi
-
-ac_add_options --enable-strip
-ac_add_options --disable-tests
-ac_add_options --disable-debug
-ac_add_options --disable-rust-debug
-ac_add_options --disable-crashreporter
-ac_add_options --disable-webrtc
-ac_add_options --disable-parental-controls
-
-ac_add_options --without-google-play-services
-ac_add_options --enable-proxy-bypass-protection
-
-# Disable telemetry
-ac_add_options MOZ_TELEMETRY_REPORTING=
\ No newline at end of file
diff --git a/projects/firefox/mozconfig-android-armv7 b/projects/firefox/mozconfig-android-armv7
deleted file mode 100644
index 9ee3bfe..0000000
--- a/projects/firefox/mozconfig-android-armv7
+++ /dev/null
@@ -1,50 +0,0 @@
-mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj-arm-linux-androideabi
-mk_add_options MOZ_APP_DISPLAYNAME="Tor Browser"
-export MOZILLA_OFFICIAL=1
-CC="clang"
-CXX="clang++"
-
-ac_add_options --with-android-min-sdk=16
-
-ac_add_options --enable-optimize
-ac_add_options --enable-official-branding
-
-ac_add_options --enable-application=mobile/android
-ac_add_options --target=arm-linux-androideabi
-ac_add_options --with-android-ndk=/var/tmp/dist/android-toolchain/android-ndk
-ac_add_options --with-android-sdk=/var/tmp/dist/android-toolchain/android-sdk-linux
-ac_add_options --with-gradle=/var/tmp/dist/android-toolchain/gradle/gradle-4.10.2/bin/gradle
-
-ac_add_options --with-android-distribution-directory=@TOPSRCDIR@/mobile/android/torbrowser
-ac_add_options --with-l10n-base=/var/tmp/dist/locales
-
-# We do not use Tor Launcher on Android:
-ac_add_options --disable-tor-launcher
-
-if [ -z "${TB_BUILD_WITH_UPDATER}" ]; then
-# Because Google Play will likely be the primary distribution medium,
-# we disable updating and rely on Google Play by default. The
-# Developer Policy explicitly prohibits in-app updating:
-#    An app distributed via Google Play may not modify, replace, or
-#    update itself using any method other than Google Plays update
-#    mechanism.
-# https://play.google.com/about/privacy-security-deception/malicious-behavior/
-
-    ac_add_options --disable-tor-browser-update
-    ac_add_options --disable-signmar
-    ac_add_options --disable-verify-mar
-fi
-
-ac_add_options --enable-strip
-ac_add_options --disable-tests
-ac_add_options --disable-debug
-ac_add_options --disable-rust-debug
-ac_add_options --disable-crashreporter
-ac_add_options --disable-webrtc
-ac_add_options --disable-parental-controls
-
-ac_add_options --without-google-play-services
-ac_add_options --enable-proxy-bypass-protection
-
-# Disable telemetry
-ac_add_options MOZ_TELEMETRY_REPORTING=
\ No newline at end of file
diff --git a/projects/firefox/mozconfig-android-x86 b/projects/firefox/mozconfig-android-x86
deleted file mode 100644
index f7e1ffa..0000000
--- a/projects/firefox/mozconfig-android-x86
+++ /dev/null
@@ -1,50 +0,0 @@
-mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj-i386-linux-android
-mk_add_options MOZ_APP_DISPLAYNAME="Tor Browser"
-export MOZILLA_OFFICIAL=1
-CC="clang"
-CXX="clang++"
-
-ac_add_options --with-android-min-sdk=16
-
-ac_add_options --enable-optimize
-ac_add_options --enable-official-branding
-
-ac_add_options --enable-application=mobile/android
-ac_add_options --target=i686-linux-android
-ac_add_options --with-android-ndk=/var/tmp/dist/android-toolchain/android-ndk
-ac_add_options --with-android-sdk=/var/tmp/dist/android-toolchain/android-sdk-linux
-ac_add_options --with-gradle=/var/tmp/dist/android-toolchain/gradle/gradle-4.10.2/bin/gradle
-
-ac_add_options --with-android-distribution-directory=@TOPSRCDIR@/mobile/android/torbrowser
-ac_add_options --with-l10n-base=/var/tmp/dist/locales
-
-# We do not use Tor Launcher on Android:
-ac_add_options --disable-tor-launcher
-
-if [ -z "${TB_BUILD_WITH_UPDATER}" ]; then
-# Because Google Play will likely be the primary distribution medium,
-# we disable updating and rely on Google Play by default. The
-# Developer Policy explicitly prohibits in-app updating:
-#    An app distributed via Google Play may not modify, replace, or
-#    update itself using any method other than Google Plays update
-#    mechanism.
-# https://play.google.com/about/privacy-security-deception/malicious-behavior/
-
-    ac_add_options --disable-tor-browser-update
-    ac_add_options --disable-signmar
-    ac_add_options --disable-verify-mar
-fi
-
-ac_add_options --enable-strip
-ac_add_options --disable-tests
-ac_add_options --disable-debug
-ac_add_options --disable-rust-debug
-ac_add_options --disable-crashreporter
-ac_add_options --disable-webrtc
-ac_add_options --disable-parental-controls
-
-ac_add_options --without-google-play-services
-ac_add_options --enable-proxy-bypass-protection
-
-# Disable telemetry
-ac_add_options MOZ_TELEMETRY_REPORTING=
\ No newline at end of file
diff --git a/projects/firefox/mozconfig-android-x86_64 b/projects/firefox/mozconfig-android-x86_64
deleted file mode 100644
index 3c78993..0000000
--- a/projects/firefox/mozconfig-android-x86_64
+++ /dev/null
@@ -1,51 +0,0 @@
-mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj-x86_64-linux-android
-mk_add_options MOZ_APP_DISPLAYNAME="Tor Browser"
-export MOZILLA_OFFICIAL=1
-CC="clang"
-CXX="clang++"
-
-ac_add_options --with-android-min-sdk=21
-
-ac_add_options --enable-optimize
-ac_add_options --enable-official-branding
-
-ac_add_options --enable-application=mobile/android
-ac_add_options --target=x86_64-linux-android
-ac_add_options --with-android-ndk=/var/tmp/dist/android-toolchain/android-ndk
-ac_add_options --with-android-sdk=/var/tmp/dist/android-toolchain/android-sdk-linux
-ac_add_options --with-gradle=/var/tmp/dist/android-toolchain/gradle/gradle-4.10.2/bin/gradle
-
-ac_add_options --with-android-distribution-directory=@TOPSRCDIR@/mobile/android/torbrowser
-ac_add_options --with-l10n-base=/var/tmp/dist/locales
-
-# We do not use Tor Launcher on Android:
-ac_add_options --disable-tor-launcher
-
-if [ -z "${TB_BUILD_WITH_UPDATER}" ]; then
-# Because Google Play will likely be the primary distribution medium,
-# we disable updating and rely on Google Play by default. The
-# Developer Policy explicitly prohibits in-app updating:
-#    An app distributed via Google Play may not modify, replace, or
-#    update itself using any method other than Google Plays update
-#    mechanism.
-# https://play.google.com/about/privacy-security-deception/malicious-behavior/
-
-    ac_add_options --disable-tor-browser-update
-    ac_add_options --disable-signmar
-    ac_add_options --disable-verify-mar
-fi
-
-ac_add_options --enable-strip
-ac_add_options --disable-tests
-ac_add_options --disable-debug
-ac_add_options --disable-rust-debug
-ac_add_options --disable-crashreporter
-ac_add_options --disable-webrtc
-ac_add_options --disable-parental-controls
-
-ac_add_options --without-google-play-services
-
-ac_add_options --enable-proxy-bypass-protection
-
-# Disable telemetry
-ac_add_options MOZ_TELEMETRY_REPORTING=
\ No newline at end of file

More information about the tor-commits mailing list