Commit 9b1a77d9 authored by Dan Ballard's avatar Dan Ballard Committed by brizental
Browse files

fixup! [android] Modify build system 

add checks for empty env vars to not override mozconfig defaults in base-browser-android
parent 57735014

browser/config/mozconfigs/base-browser-android

+15 −4
Original line number Diff line number Diff line
@@ -11,11 +11,22 @@ ac_add_options --enable-application=mobile/android 
CC="clang"

CXX="clang++"

ac_add_options --enable-linker=lld

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



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



ac_add_options --with-android-min-sdk=21



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