Bug 1124503 move AppConstants.jsm to toolkit r=gavin
authorPhilip Chee <philip.chee@gmail.com>
Fri, 06 Mar 2015 00:18:20 +0800
changeset 232046 be4fec24c85cda99fd5967d47a1833631511c4fe
parent 232045 ad7dc4416bc36efcb9fbf02082e05aa54c191825
child 232047 3da36cdb419880db37fdfff9cf1d3bf94aed1713
push id56439
push userphilip.chee@gmail.com
push dateThu, 05 Mar 2015 16:33:27 +0000
treeherdermozilla-inbound@be4fec24c85c [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersgavin
bugs1124503
milestone39.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1124503 move AppConstants.jsm to toolkit r=gavin
mobile/android/modules/AppConstants.jsm
mobile/android/modules/moz.build
toolkit/modules/AppConstants.jsm
toolkit/modules/moz.build
--- a/mobile/android/modules/moz.build
+++ b/mobile/android/modules/moz.build
@@ -25,23 +25,8 @@ EXTRA_JS_MODULES += [
     'Prompt.jsm',
     'Sanitizer.jsm',
     'SharedPreferences.jsm',
     'SSLExceptions.jsm',
     'TabMirror.jsm',
     'WebappManager.jsm',
     'WebappManagerWorker.js',
 ]
-
-for var in ('ANDROID_PACKAGE_NAME', 'MOZ_APP_VERSION'):
-    DEFINES[var] = CONFIG[var]
-
-for var in ('NIGHTLY_BUILD', 'RELEASE_BUILD', 'ACCESSIBILITY',
-    'MOZILLA_OFFICIAL', 'MOZ_OFFICIAL_BRANDING', 'MOZ_SERVICES_HEALTHREPORT',
-    'MOZ_DEVICES', 'MOZ_DEVICES', 'MOZ_SAFE_BROWSING',
-    'MOZ_TELEMETRY_REPORTING', 'MOZ_WEBRTC'):
-    if CONFIG[var]:
-        DEFINES[var] = 1
-
-# Keep it this way if at all possible.
-EXTRA_PP_JS_MODULES += [
-    'AppConstants.jsm',
-]
rename from mobile/android/modules/AppConstants.jsm
rename to toolkit/modules/AppConstants.jsm
--- a/toolkit/modules/moz.build
+++ b/toolkit/modules/moz.build
@@ -81,13 +81,21 @@ else:
     DEFINES['ANDROID'] = True
 
 
 if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':
     EXTRA_JS_MODULES += [
         'WindowsRegistry.jsm',
     ]
 
-DEFINES['MOZ_APP_NAME'] = CONFIG['MOZ_APP_NAME']
-DEFINES['MOZ_BUILD_APP'] = CONFIG['MOZ_BUILD_APP']
+for var in ('ANDROID_PACKAGE_NAME',
+            'MOZ_APP_NAME',
+            'MOZ_APP_VERSION'):
+            DEFINES[var] = CONFIG[var]
 
-if CONFIG['MOZ_TOOLKIT_SEARCH']:
-    DEFINES['MOZ_TOOLKIT_SEARCH'] = True
+for var in ('MOZILLA_OFFICIAL',
+            'MOZ_TOOLKIT_SEARCH'):
+    if CONFIG[var]:
+        DEFINES[var] = True
+
+EXTRA_PP_JS_MODULES += [
+    'AppConstants.jsm',
+]