Commit 5bc80efe authored by brizental's avatar brizental Committed by Pier Angelo Vendrame
Browse files

fixup! Base Browser's .mozconfigs. 

Bug 44848: Stop overwriting Android toolchain paths.
Keep the overwrites only on tor-browser-build.
parent 26e0bac5

browser/config/mozconfigs/base-browser-android

+0 −14
Original line number Diff line number Diff line
@@ -13,20 +13,6 @@ CC="clang" 
CXX="clang++"

ac_add_options --enable-linker=lld



if test -n "$ANDROID_HOME"; then

    ac_add_options --with-android-sdk=$ANDROID_HOME

fi



if test -n "$ANDROID_NDK_HOME"; then

  ac_add_options --with-android-ndk=$ANDROID_NDK_HOME

fi



if test -n "$GRADLE_HOME"; then

    ac_add_options --with-gradle=$GRADLE_HOME/bin/gradle

fi

# Otherwise (as per /mobile/android/gradle.config) a version will be downloaded by the gradle wrapper when needed

# so don't use this override, and let it do it's thing



ac_add_options --enable-strip

ac_add_options --enable-install-strip

ac_add_options --disable-tests

mozconfig-android-all

+0 −4
Original line number Diff line number Diff line
@@ -8,10 +8,6 @@ ac_add_options --enable-application=mobile/android 


ac_add_options --disable-compile-environment



ac_add_options --with-java-bin-path=$JAVA_HOME/bin

ac_add_options --with-android-sdk=$ANDROID_HOME

ac_add_options --with-gradle=$GRADLE_HOME/bin/gradle



ac_add_options --disable-tests

ac_add_options --disable-debug