Skip to content

Commit

Permalink
Bug 832352, patch 2: Make sure all mobile/android mozconfigs include …
Browse files Browse the repository at this point in the history 
…build/mozconfig.common.override. r=ted
  • Loading branch information
@dbaron
dbaron committed Jan 22, 2013
1 parent 13eaec8 commit d9ebcd2
Show file tree
Hide file tree
Showing 16 changed files with 32 additions and 0 deletions.
2 changes: 2 additions & 0 deletions mobile/android/config/mozconfigs/android-armv6/debug
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,3 +30,5 @@ ac_add_options --enable-warnings-as-errors

# Use ccache
ac_add_options --with-ccache=/usr/bin/ccache

. "$topsrcdir/mobile/android/config/mozconfigs/common.override"
2 changes: 2 additions & 0 deletions mobile/android/config/mozconfigs/android-armv6/l10n-nightly
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,3 +28,5 @@ export MOZILLA_OFFICIAL=1
export MOZ_PKG_SPECIAL=armv6

ac_add_options --with-branding=mobile/android/branding/nightly

. "$topsrcdir/mobile/android/config/mozconfigs/common.override"
2 changes: 2 additions & 0 deletions mobile/android/config/mozconfigs/android-armv6/l10n-release
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,3 +26,5 @@ export MOZ_PKG_SPECIAL=armv6

ac_add_options --enable-official-branding
ac_add_options --with-branding=mobile/android/branding/beta

. "$topsrcdir/mobile/android/config/mozconfigs/common.override"
2 changes: 2 additions & 0 deletions mobile/android/config/mozconfigs/android-armv6/nightly
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,3 +28,5 @@ ac_add_options --enable-warnings-as-errors

# Use ccache
ac_add_options --with-ccache=/usr/bin/ccache

. "$topsrcdir/mobile/android/config/mozconfigs/common.override"
2 changes: 2 additions & 0 deletions mobile/android/config/mozconfigs/android-armv6/release
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,3 +24,5 @@ export MOZ_PKG_SPECIAL=armv6

ac_add_options --enable-official-branding
ac_add_options --with-branding=mobile/android/branding/beta

. "$topsrcdir/mobile/android/config/mozconfigs/common.override"
2 changes: 2 additions & 0 deletions mobile/android/config/mozconfigs/android-noion/nightly
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,3 +30,5 @@ 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"
2 changes: 2 additions & 0 deletions mobile/android/config/mozconfigs/android-x86/debug
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,3 +25,5 @@ ac_add_options --enable-warnings-as-errors

# Use ccache
ac_add_options --with-ccache=/usr/bin/ccache

. "$topsrcdir/mobile/android/config/mozconfigs/common.override"
2 changes: 2 additions & 0 deletions mobile/android/config/mozconfigs/android-x86/l10n-nightly
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,3 +26,5 @@ export JAVA_HOME=/tools/jdk6
export MOZILLA_OFFICIAL=1

ac_add_options --with-branding=mobile/android/branding/nightly

. "$topsrcdir/mobile/android/config/mozconfigs/common.override"
2 changes: 2 additions & 0 deletions mobile/android/config/mozconfigs/android-x86/l10n-release
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,3 +24,5 @@ export MOZILLA_OFFICIAL=1

ac_add_options --enable-official-branding
ac_add_options --with-branding=mobile/android/branding/beta

. "$topsrcdir/mobile/android/config/mozconfigs/common.override"
2 changes: 2 additions & 0 deletions mobile/android/config/mozconfigs/android-x86/nightly
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,3 +23,5 @@ ac_add_options --enable-warnings-as-errors

# Use ccache
ac_add_options --with-ccache=/usr/bin/ccache

. "$topsrcdir/mobile/android/config/mozconfigs/common.override"
2 changes: 2 additions & 0 deletions mobile/android/config/mozconfigs/android-x86/release
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,3 +19,5 @@ export MOZ_TELEMETRY_REPORTING=1

ac_add_options --enable-official-branding
ac_add_options --with-branding=mobile/android/branding/beta

. "$topsrcdir/mobile/android/config/mozconfigs/common.override"
2 changes: 2 additions & 0 deletions mobile/android/config/mozconfigs/android/debug
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,3 +25,5 @@ ac_add_options --enable-warnings-as-errors

# Use ccache
ac_add_options --with-ccache=/usr/bin/ccache

. "$topsrcdir/mobile/android/config/mozconfigs/common.override"
2 changes: 2 additions & 0 deletions mobile/android/config/mozconfigs/android/l10n-nightly
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,3 +26,5 @@ export JAVA_HOME=/tools/jdk6
export MOZILLA_OFFICIAL=1

ac_add_options --with-branding=mobile/android/branding/nightly

. "$topsrcdir/mobile/android/config/mozconfigs/common.override"
2 changes: 2 additions & 0 deletions mobile/android/config/mozconfigs/android/l10n-release
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,3 +24,5 @@ export MOZILLA_OFFICIAL=1

ac_add_options --enable-official-branding
ac_add_options --with-branding=mobile/android/branding/beta

. "$topsrcdir/mobile/android/config/mozconfigs/common.override"
2 changes: 2 additions & 0 deletions mobile/android/config/mozconfigs/android/nightly
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,3 +27,5 @@ 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"
2 changes: 2 additions & 0 deletions mobile/android/config/mozconfigs/android/release
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,3 +19,5 @@ export MOZ_TELEMETRY_REPORTING=1

ac_add_options --enable-official-branding
ac_add_options --with-branding=mobile/android/branding/beta

. "$topsrcdir/mobile/android/config/mozconfigs/common.override"

0 comments on commit d9ebcd2

Please sign in to comment.