Merge m-c to inbound.

This commit is contained in:
Ryan VanderMeulen 2012-09-10 20:08:20 -04:00
commit b66dcfc920
14 changed files with 42 additions and 0 deletions

View File

@ -11,6 +11,9 @@ ac_add_options --enable-signmar
# Avoid dependency on libstdc++ 4.5
ac_add_options --enable-stdcxx-compat
# IonMonkey disabled in bug 789373
ac_add_options --disable-ion
# This will overwrite the default of stripping everything and keep the symbol table.
# This is useful for profiling and debugging and only increases the package size
# by 2 MBs.

View File

@ -11,6 +11,9 @@ ac_add_options --enable-js-diagnostics
# Avoid dependency on libstdc++ 4.5
ac_add_options --enable-stdcxx-compat
# IonMonkey disabled in bug 789373
ac_add_options --disable-ion
# This will overwrite the default of stripping everything and keep the symbol table.
# This is useful for profiling and debugging and only increases the package size
# by 2 MBs.

View File

@ -8,6 +8,9 @@ ac_add_options --enable-signmar
# Nightlies only since this has a cost in performance
ac_add_options --enable-js-diagnostics
# IonMonkey disabled in bug 789373
ac_add_options --disable-ion
# Needed to enable breakpad in application.ini
export MOZILLA_OFFICIAL=1

View File

@ -11,6 +11,9 @@ ac_add_options --enable-signmar
# Nightlies only since this has a cost in performance
ac_add_options --enable-js-diagnostics
# IonMonkey disabled in bug 789373
ac_add_options --disable-ion
# Needed to enable breakpad in application.ini
export MOZILLA_OFFICIAL=1

View File

@ -14,6 +14,9 @@ ac_add_options --with-android-sdk="/tools/android-sdk-r16/platforms/android-16"
ac_add_options --with-android-version=9
ac_add_options --with-system-zlib
# IonMonkey disabled in bug 789373
ac_add_options --disable-ion
export JAVA_HOME=/tools/jdk6
export MOZILLA_OFFICIAL=1
export MOZ_TELEMETRY_REPORTING=1

View File

@ -22,6 +22,9 @@ ac_add_options --with-system-zlib
ac_add_options --enable-updater
ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
# IonMonkey disabled in bug 789373
ac_add_options --disable-ion
export JAVA_HOME=/tools/jdk6
export MOZILLA_OFFICIAL=1

View File

@ -18,6 +18,9 @@ ac_add_options --with-system-zlib
ac_add_options --enable-updater
ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
# IonMonkey disabled in bug 789373
ac_add_options --disable-ion
export JAVA_HOME=/tools/jdk6
export MOZILLA_OFFICIAL=1

View File

@ -14,6 +14,9 @@ ac_add_options --with-android-version=9
ac_add_options --with-system-zlib
ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
# IonMonkey disabled in bug 789373
ac_add_options --disable-ion
export JAVA_HOME=/tools/jdk6
export MOZILLA_OFFICIAL=1
export MOZ_TELEMETRY_REPORTING=1

View File

@ -15,6 +15,9 @@ ac_add_options --with-system-zlib
ac_add_options --enable-updater
ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
# IonMonkey disabled in bug 789373
ac_add_options --disable-ion
export JAVA_HOME=/tools/jdk6
export MOZILLA_OFFICIAL=1
export MOZ_TELEMETRY_REPORTING=1

View File

@ -14,6 +14,9 @@ ac_add_options --with-android-sdk="/tools/android-sdk-r16/platforms/android-16"
ac_add_options --with-android-version=5
ac_add_options --with-system-zlib
# IonMonkey disabled in bug 789373
ac_add_options --disable-ion
export JAVA_HOME=/tools/jdk6
export MOZILLA_OFFICIAL=1
export MOZ_TELEMETRY_REPORTING=1

View File

@ -22,6 +22,9 @@ ac_add_options --with-system-zlib
ac_add_options --enable-updater
ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
# IonMonkey disabled in bug 789373
ac_add_options --disable-ion
export JAVA_HOME=/tools/jdk6
export MOZILLA_OFFICIAL=1

View File

@ -18,6 +18,9 @@ ac_add_options --with-system-zlib
ac_add_options --enable-updater
ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
# IonMonkey disabled in bug 789373
ac_add_options --disable-ion
export JAVA_HOME=/tools/jdk6
export MOZILLA_OFFICIAL=1

View File

@ -14,6 +14,9 @@ ac_add_options --with-android-version=5
ac_add_options --with-system-zlib
ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
# IonMonkey disabled in bug 789373
ac_add_options --disable-ion
export JAVA_HOME=/tools/jdk6
export MOZILLA_OFFICIAL=1
export MOZ_TELEMETRY_REPORTING=1

View File

@ -15,6 +15,9 @@ ac_add_options --with-system-zlib
ac_add_options --enable-updater
ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
# IonMonkey disabled in bug 789373
ac_add_options --disable-ion
export JAVA_HOME=/tools/jdk6
export MOZILLA_OFFICIAL=1
export MOZ_TELEMETRY_REPORTING=1