commit 390c98393fd87984ebf3a0a1d0d0aaac08d81190 Author: Sukhbir Singh sukhbir@torproject.org Date: Thu Jul 2 01:54:16 2015 -0400

Update mozconfig build options

Add flags to disable WebRTC, tests and debug builds --- projects/instantbird/mozconfig-linux-i686 | 6 ++++-- projects/instantbird/mozconfig-linux-x86_64 | 5 +++-- projects/instantbird/mozconfig-osx-x86_64 | 9 +++------ projects/instantbird/mozconfig-windows-i686 | 12 +++++------- 4 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/projects/instantbird/mozconfig-linux-i686 b/projects/instantbird/mozconfig-linux-i686 index 8a2a9ff..b7fe30a 100644 --- a/projects/instantbird/mozconfig-linux-i686 +++ b/projects/instantbird/mozconfig-linux-i686 @@ -16,13 +16,15 @@ mk_add_options MOZ_MAKE_FLAGS="-j$CONCURRENCY" ac_add_options --with-ccache ac_add_options --enable-application=im ac_add_options --enable-optimize -ac_add_options --disable-debug

ac_add_options --with-l10n-base=.. + ac_add_options --host=i686-linux-gnu

ac_add_options --with-branding=im/branding/messenger

ac_add_options --disable-updater - ac_add_options --disable-crashreporter +ac_add_options --disable-webrtc +ac_add_options --disable-tests +ac_add_options --disable-debug diff --git a/projects/instantbird/mozconfig-linux-x86_64 b/projects/instantbird/mozconfig-linux-x86_64 index d14b06c..3953e7f 100644 --- a/projects/instantbird/mozconfig-linux-x86_64 +++ b/projects/instantbird/mozconfig-linux-x86_64 @@ -13,12 +13,13 @@ mk_add_options MOZ_MAKE_FLAGS="-j$CONCURRENCY" ac_add_options --with-ccache ac_add_options --enable-application=im ac_add_options --enable-optimize -ac_add_options --disable-debug

ac_add_options --with-l10n-base=..

ac_add_options --with-branding=im/branding/messenger

ac_add_options --disable-updater - ac_add_options --disable-crashreporter +ac_add_options --disable-webrtc +ac_add_options --disable-tests +ac_add_options --disable-debug diff --git a/projects/instantbird/mozconfig-osx-x86_64 b/projects/instantbird/mozconfig-osx-x86_64 index 0c679cf..4561ee1 100644 --- a/projects/instantbird/mozconfig-osx-x86_64 +++ b/projects/instantbird/mozconfig-osx-x86_64 @@ -14,14 +14,9 @@ mk_add_options MOZ_MAKE_FLAGS="-j$CONCURRENCY"

ac_add_options --enable-application=im ac_add_options --enable-optimize -ac_add_options --disable-debug ac_add_options --target=x86_64-apple-darwin10 ac_add_options --enable-strip ac_add_options --with-macos-private-frameworks="$CROSS_PRIVATE_FRAMEWORKS" -ac_add_options --disable-crashreporter -ac_add_options --disable-maintenance-service -ac_add_options --disable-webrtc -ac_add_options --disable-tests # Let's not compile EME at least until we can enable ClearKey and only Clearkey. # (Apart from that there is no Adobe CRM module for OS X right now) ac_add_options --disable-eme @@ -31,5 +26,7 @@ ac_add_options --with-l10n-base=.. ac_add_options --with-branding=im/branding/messenger

ac_add_options --disable-updater - ac_add_options --disable-crashreporter +ac_add_options --disable-webrtc +ac_add_options --disable-tests +ac_add_options --disable-debug diff --git a/projects/instantbird/mozconfig-windows-i686 b/projects/instantbird/mozconfig-windows-i686 index 2d4a5c4..72b5a9a 100644 --- a/projects/instantbird/mozconfig-windows-i686 +++ b/projects/instantbird/mozconfig-windows-i686 @@ -11,7 +11,6 @@ mk_add_options MOZ_MAKE_FLAGS="-j$CONCURRENCY"

ac_add_options --enable-application=im ac_add_options --enable-optimize -ac_add_options --disable-debug

ac_add_options --with-l10n-base=..

@@ -21,14 +20,13 @@ ac_add_options --disable-sandbox # ICU seems still to have cross-compiling issues: # https://bugzilla.mozilla.org/show_bug.cgi?id=1019744#c19 ac_add_options --without-intl-api -ac_add_options --disable-crashreporter -ac_add_options --disable-maintenance-service -ac_add_options --disable-webrtc -ac_add_options --disable-tests -ac_add_options --disable-signmar

ac_add_options --with-branding=im/branding/messenger

ac_add_options --disable-updater - ac_add_options --disable-crashreporter +ac_add_options --disable-maintenance-service +ac_add_options --disable-webrtc +ac_add_options --disable-tests +ac_add_options --disable-signmar +ac_add_options --disable-debug