From 924cf7a253b1e6e743206f6acc8dc45695a08a1f Mon Sep 17 00:00:00 2001 From: Brad Lassey Date: Mon, 14 Apr 2014 18:33:11 -0700 Subject: [PATCH] bug 996358 - Add flags to keep tab streaming from going to Beta or Release r=mfinkle --HG-- extra : rebase_source : 8d903784db2a5d15a0ef109ce3143dd1cbb6c4b9 --- mobile/android/components/MobileComponents.manifest | 2 ++ mobile/android/installer/package-manifest.in | 2 ++ 2 files changed, 4 insertions(+) diff --git a/mobile/android/components/MobileComponents.manifest b/mobile/android/components/MobileComponents.manifest index 3972529c4ee3..ad8cd369592b 100644 --- a/mobile/android/components/MobileComponents.manifest +++ b/mobile/android/components/MobileComponents.manifest @@ -98,9 +98,11 @@ contract @mozilla.org/payment/ui-glue;1 {3c6c9575-f57e-427b-a8aa-57bc3cbff48f} component {18a4e042-7c7c-424b-a583-354e68553a7f} FilePicker.js contract @mozilla.org/filepicker;1 {18a4e042-7c7c-424b-a583-354e68553a7f} +#ifndef RELEASE_BUILD # TabSource.js component {5850c76e-b916-4218-b99a-31f004e0a7e7} TabSource.js contract @mozilla.org/tab-source-service;1 {5850c76e-b916-4218-b99a-31f004e0a7e7} +#endif # Snippets.js component {a78d7e59-b558-4321-a3d6-dffe2f1e76dd} Snippets.js diff --git a/mobile/android/installer/package-manifest.in b/mobile/android/installer/package-manifest.in index ef014c7a3096..318a68a8ad38 100644 --- a/mobile/android/installer/package-manifest.in +++ b/mobile/android/installer/package-manifest.in @@ -334,7 +334,9 @@ @BINPATH@/components/amContentHandler.js @BINPATH@/components/amWebInstallListener.js @BINPATH@/components/nsBlocklistService.js +#ifndef RELEASE_BUILD @BINPATH@/components/TabSource.js +#endif @BINPATH@/components/webvtt.xpt @BINPATH@/components/WebVTT.manifest @BINPATH@/components/WebVTTParserWrapper.js