Use MOZ_PHOENIX instead of checking for 'browser' in MOZ_BUILD_APP

7 files changed, 11 insertions, 7 deletions

diff --git a/toolkit/themes/linux/mozapps/jar.mn b/toolkit/themes/linux/mozapps/jar.mn
index 2070dd6fdb..8d1c12305d 100644
--- a/toolkit/themes/linux/mozapps/jar.mn
+++ b/toolkit/themes/linux/mozapps/jar.mn
@@ -28,7 +28,7 @@ toolkit.jar:
   skin/classic/mozapps/update/updates.css                  (update/updates.css)
   skin/classic/mozapps/viewsource/viewsource.css           (viewsource/viewsource.css)
 
-#if MOZ_BUILD_APP == browser
+#ifdef MOZ_PHOENIX
 [browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}] chrome.jar:
 #elif MOZ_SEPARATE_MANIFEST_FOR_THEME_OVERRIDES
 [extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}] chrome.jar:
diff --git a/toolkit/themes/moz.build b/toolkit/themes/moz.build
index 3d435ba71e..4031f36b8f 100644
--- a/toolkit/themes/moz.build
+++ b/toolkit/themes/moz.build
@@ -17,7 +17,11 @@
 # mobile                  native UIs that do not use XUL for UI
 
 toolkit = CONFIG['MOZ_WIDGET_TOOLKIT']
-app = CONFIG['MOZ_BUILD_APP']
+if CONFIG['MOZ_PHOENIX']:
+    DEFINES['MOZ_PHOENIX'] = 1
+    app = 'browser'
+else:
+    app = CONFIG['MOZ_BUILD_APP']
 
 if toolkit == 'cocoa':
     DIRS += ['osx']
diff --git a/toolkit/themes/osx/global/jar.mn b/toolkit/themes/osx/global/jar.mn
index e979d4a8c3..79bb062ab9 100644
--- a/toolkit/themes/osx/global/jar.mn
+++ b/toolkit/themes/osx/global/jar.mn
@@ -145,7 +145,7 @@ toolkit.jar:
   skin/classic/global/tree/folder.png                                (tree/folder.png)
   skin/classic/global/tree/folder@2x.png                             (tree/folder@2x.png)
 
-#if MOZ_BUILD_APP == browser
+#ifdef MOZ_PHOENIX
 [browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}] chrome.jar:
 #elif MOZ_SEPARATE_MANIFEST_FOR_THEME_OVERRIDES
 [extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}] chrome.jar:
diff --git a/toolkit/themes/osx/mozapps/jar.mn b/toolkit/themes/osx/mozapps/jar.mn
index 3b58f1e4e5..3f57170734 100644
--- a/toolkit/themes/osx/mozapps/jar.mn
+++ b/toolkit/themes/osx/mozapps/jar.mn
@@ -51,7 +51,7 @@ toolkit.jar:
   skin/classic/mozapps/xpinstall/xpinstallConfirm.css             (extensions/xpinstallConfirm.css)
   skin/classic/mozapps/handling/handling.css                      (handling/handling.css)
 
-#if MOZ_BUILD_APP == browser
+#ifdef MOZ_PHOENIX
 [browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}] chrome.jar:
 #elif MOZ_SEPARATE_MANIFEST_FOR_THEME_OVERRIDES
 [extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}] chrome.jar:
diff --git a/toolkit/themes/shared/non-mac.jar.inc.mn b/toolkit/themes/shared/non-mac.jar.inc.mn
index 151749f72f..859f1ba4a5 100644
--- a/toolkit/themes/shared/non-mac.jar.inc.mn
+++ b/toolkit/themes/shared/non-mac.jar.inc.mn
@@ -123,7 +123,7 @@
   skin/classic/mozapps/update/downloadButtons.png            (../../windows/mozapps/update/downloadButtons.png)
 * skin/classic/mozapps/xpinstall/xpinstallConfirm.css        (../../windows/mozapps/extensions/xpinstallConfirm.css)
 
-#if MOZ_BUILD_APP == browser
+#ifdef MOZ_PHOENIX
 [browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}] chrome.jar:
 #elif MOZ_SEPARATE_MANIFEST_FOR_THEME_OVERRIDES
 [extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}] chrome.jar:
diff --git a/toolkit/themes/windows/global/jar.mn b/toolkit/themes/windows/global/jar.mn
index 48613e7947..7f07710204 100644
--- a/toolkit/themes/windows/global/jar.mn
+++ b/toolkit/themes/windows/global/jar.mn
@@ -90,7 +90,7 @@ toolkit.jar:
   skin/classic/global/tree/twisty-XP.svg                         (tree/twisty-XP.svg)
   skin/classic/global/tree/twisty-Vista78.svg                    (tree/twisty-Vista78.svg)
 
-#if MOZ_BUILD_APP == browser
+#ifdef MOZ_PHOENIX
 [browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}] chrome.jar:
 #elif MOZ_SEPARATE_MANIFEST_FOR_THEME_OVERRIDES
 [extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}] chrome.jar:
diff --git a/toolkit/themes/windows/mozapps/jar.mn b/toolkit/themes/windows/mozapps/jar.mn
index 9cf4acda34..901e93e4e7 100644
--- a/toolkit/themes/windows/mozapps/jar.mn
+++ b/toolkit/themes/windows/mozapps/jar.mn
@@ -43,7 +43,7 @@ toolkit.jar:
   skin/classic/mozapps/profile/profileicon-XP.png            (profile/profileicon-XP.png)
   skin/classic/mozapps/update/downloadButtons-XP.png         (update/downloadButtons-XP.png)
 
-#if MOZ_BUILD_APP == browser
+#ifdef MOZ_PHOENIX
 [browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}] chrome.jar:
 #elif MOZ_SEPARATE_MANIFEST_FOR_THEME_OVERRIDES
 [extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}] chrome.jar: