1
2# HG changeset patch
3# User Michelangelo De Simone <mdesimone@mozilla.com>
4# Date 1479198095 28800
5# Node ID fde6e9ccfc72fbc0fcd93af7a40436b216e7ea1a
6# Parent 687eac6845a77d2cac5505da9c8912885c2a9e57
7Bug 1013882 - TestInterfaceJS should be packaged only if it's available. r=glandium, a=jcristau
8
9MozReview-Commit-ID: IEHesdoU4Sz
10
11diff --git a/b2g/installer/package-manifest.in b/b2g/installer/package-manifest.in
12--- a/b2g/installer/package-manifest.in
13+++ b/b2g/installer/package-manifest.in
14@@ -570,17 +570,17 @@
15 @RESPATH@/components/InputMethod.manifest
16 #ifdef MOZ_B2G
17 @RESPATH@/components/inputmethod.xpt
18 #endif
19
20 @RESPATH@/components/SystemUpdate.manifest
21 @RESPATH@/components/SystemUpdateManager.js
22
23-#ifdef MOZ_DEBUG
24+#if defined(ENABLE_TESTS) && defined(MOZ_DEBUG)
25 @RESPATH@/components/TestInterfaceJS.js
26 @RESPATH@/components/TestInterfaceJS.manifest
27 @RESPATH@/components/TestInterfaceJSMaplike.js
28 #endif
29
30 ; Modules
31 @RESPATH@/modules/*
32
33diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in
34--- a/browser/installer/package-manifest.in
35+++ b/browser/installer/package-manifest.in
36@@ -554,17 +554,17 @@
37 @RESPATH@/components/PresentationControlService.js
38 @RESPATH@/components/PresentationDataChannelSessionTransport.js
39 @RESPATH@/components/PresentationDataChannelSessionTransport.manifest
40
41 ; InputMethod API
42 @RESPATH@/components/MozKeyboard.js
43 @RESPATH@/components/InputMethod.manifest
44
45-#ifdef MOZ_DEBUG
46+#if defined(ENABLE_TESTS) && defined(MOZ_DEBUG)
47 @RESPATH@/components/TestInterfaceJS.js
48 @RESPATH@/components/TestInterfaceJS.manifest
49 @RESPATH@/components/TestInterfaceJSMaplike.js
50 #endif
51
52 ; [Extensions]
53 @RESPATH@/components/extensions-toolkit.manifest
54 @RESPATH@/browser/components/extensions-browser.manifest
55diff --git a/mobile/android/installer/package-manifest.in b/mobile/android/installer/package-manifest.in
56--- a/mobile/android/installer/package-manifest.in
57+++ b/mobile/android/installer/package-manifest.in
58@@ -381,17 +381,17 @@
59
60 @BINPATH@/components/CaptivePortalDetectComponents.manifest
61 @BINPATH@/components/captivedetect.js
62
63 #ifdef MOZ_WEBSPEECH
64 @BINPATH@/components/dom_webspeechsynth.xpt
65 #endif
66
67-#ifdef MOZ_DEBUG
68+#if defined(ENABLE_TESTS) && defined(MOZ_DEBUG)
69 @BINPATH@/components/TestInterfaceJS.js
70 @BINPATH@/components/TestInterfaceJS.manifest
71 @BINPATH@/components/TestInterfaceJSMaplike.js
72 #endif
73
74 @BINPATH@/components/nsAsyncShutdown.manifest
75 @BINPATH@/components/nsAsyncShutdown.js
76
77