bug 894885 - move common mozconfig options to the common mozconfig, follow up to move some things back r=glandium

This commit is contained in:
Brad Lassey 2013-07-23 17:49:17 -04:00
parent dcfca73b20
commit 92e3addcc0
4 changed files with 39 additions and 15 deletions

View File

@ -3,4 +3,12 @@
ac_add_options --target=arm-linux-androideabi
ac_add_options --with-arch=armv6
export MOZ_PKG_SPECIAL=armv6
export MOZ_PKG_SPECIAL=armv6
ac_add_options --with-branding=mobile/android/branding/nightly
export JAVA_HOME=/tools/jdk6
export MOZILLA_OFFICIAL=1
export MOZ_TELEMETRY_REPORTING=1
. "$topsrcdir/mobile/android/config/mozconfigs/common.override"

View File

@ -1,3 +1,18 @@
. "$topsrcdir/mobile/android/config/mozconfigs/common"
ac_add_options --target=i386-linux-android
ac_add_options --enable-profiling
ac_add_options --disable-elf-hack # --enable-elf-hack conflicts with --enable-profiling
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 JAVA_HOME=/tools/jdk6
export MOZILLA_OFFICIAL=1
export MOZ_TELEMETRY_REPORTING=1
. "$topsrcdir/mobile/android/config/mozconfigs/common.override"

View File

@ -1 +1,16 @@
. "$topsrcdir/mobile/android/config/mozconfigs/common"
ac_add_options --enable-profiling
ac_add_options --disable-elf-hack # --enable-elf-hack conflicts with --enable-profiling
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 JAVA_HOME=/tools/jdk6
export MOZILLA_OFFICIAL=1
export MOZ_TELEMETRY_REPORTING=1
. "$topsrcdir/mobile/android/config/mozconfigs/common.override"

View File

@ -35,23 +35,9 @@ ac_add_options --with-android-gnu-compiler-version=4.7
ac_add_options --with-android-version=9
ac_add_options --with-system-zlib
ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
ac_add_options --enable-profiling
ac_add_options --disable-elf-hack # --enable-elf-hack conflicts with --enable-profiling
export JAVA_HOME=/tools/jdk6
export MOZILLA_OFFICIAL=1
export MOZ_TELEMETRY_REPORTING=1
ac_add_options --with-branding=mobile/android/branding/nightly
# Treat warnings as errors in directories with FAIL_ON_WARNINGS.
ac_add_options --enable-warnings-as-errors
# Use ccache
ac_add_options --with-ccache=/usr/bin/ccache
# 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"
. "$topsrcdir/mobile/android/config/mozconfigs/common.override"