Merge heads.

This commit is contained in:
Ben Hearsum 2015-02-09 11:41:21 -05:00
commit 62639c0951
4 changed files with 88 additions and 0 deletions

View File

@ -0,0 +1,25 @@
. "$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=11
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
export MOZ_DISABLE_GECKOVIEW=1
ac_add_options --enable-official-branding
ac_add_options --with-branding=mobile/android/branding/beta
ac_add_options --disable-stdcxx-compat
. "$topsrcdir/mobile/android/config/mozconfigs/common.override"

View File

@ -0,0 +1,16 @@
. "$topsrcdir/mobile/android/config/mozconfigs/common"
# Android
ac_add_options --with-android-min-sdk=11
ac_add_options --target=arm-linux-androideabi
ac_add_options --with-branding=mobile/android/branding/beta
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"

View File

@ -0,0 +1,27 @@
. "$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=9
ac_add_options --with-android-max-sdk=10
ac_add_options --enable-android-resource-constrained
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
export MOZ_DISABLE_GECKOVIEW=1
ac_add_options --enable-official-branding
ac_add_options --with-branding=mobile/android/branding/beta
ac_add_options --disable-stdcxx-compat
. "$topsrcdir/mobile/android/config/mozconfigs/common.override"

View File

@ -0,0 +1,20 @@
. "$topsrcdir/mobile/android/config/mozconfigs/common"
# Android
ac_add_options --with-android-min-sdk=9
ac_add_options --with-android-max-sdk=10
ac_add_options --enable-android-resource-constrained
export MOZ_DISABLE_GECKOVIEW=1
ac_add_options --target=arm-linux-androideabi
ac_add_options --with-branding=mobile/android/branding/beta
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"