Bug 1049249 - Remove app_libxul_dirs. r=mshal
authorMike Hommey <mh+mozilla@glandium.org>
Thu, 07 Aug 2014 02:58:49 +0900
changeset 198220 5bdf577bf6e0b1e7d60abc01f306dfeca26c7505
parent 198219 b755c903799edb8caf35a8485d5f8400ee1a6449
child 198221 b5abd8d46814c064db71a22a1bc9020e7ce0f940
push id8089
push usernigelbabu@gmail.com
push dateThu, 07 Aug 2014 03:54:40 +0000
treeherderfx-team@48c9243ab15a [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmshal
bugs1049249
milestone34.0a1
Bug 1049249 - Remove app_libxul_dirs. r=mshal
b2g/app.mozbuild
b2g/dev/app.mozbuild
browser/app.mozbuild
mobile/android/app.mozbuild
mobile/android/components/moz.build
toolkit/toolkit.mozbuild
xulrunner/app.mozbuild
--- a/b2g/app.mozbuild
+++ b/b2g/app.mozbuild
@@ -1,16 +1,14 @@
 # vim: set filetype=python:
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 if not CONFIG['LIBXUL_SDK']:
-    app_libxul_dirs = []
-
     include('/toolkit/toolkit.mozbuild')
 elif CONFIG['ENABLE_TESTS']:
     add_tier_dir('testharness', 'testing/mochitest')
 
 if CONFIG['MOZ_EXTENSIONS']:
     add_tier_dir('app', 'extensions')
 
 add_tier_dir('app', CONFIG['MOZ_BRANDING_DIRECTORY'])
--- a/b2g/dev/app.mozbuild
+++ b/b2g/dev/app.mozbuild
@@ -1,15 +1,14 @@
 # vim: set filetype=python:
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 if not CONFIG['LIBXUL_SDK']:
-    app_libxul_dirs = []
     include('/toolkit/toolkit.mozbuild')
 
 if CONFIG['MOZ_EXTENSIONS']:
     add_tier_dir('app', 'extensions')
 
 add_tier_dir('app', [CONFIG['MOZ_BRANDING_DIRECTORY']])
 
 if CONFIG['MOZ_WEBAPP_RUNTIME']:
--- a/browser/app.mozbuild
+++ b/browser/app.mozbuild
@@ -1,15 +1,14 @@
 # vim: set filetype=python:
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 if not CONFIG['LIBXUL_SDK']:
-    app_libxul_dirs = []
     include('/toolkit/toolkit.mozbuild')
 
 if CONFIG['MOZ_EXTENSIONS']:
     add_tier_dir('app', 'extensions')
 
 add_tier_dir('app', [CONFIG['MOZ_BRANDING_DIRECTORY']])
 
 if CONFIG['MOZ_WEBAPP_RUNTIME']:
--- a/mobile/android/app.mozbuild
+++ b/mobile/android/app.mozbuild
@@ -1,16 +1,14 @@
 # vim: set filetype=python:
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 if not CONFIG['LIBXUL_SDK']:
-    app_libxul_dirs = ['mobile/android/components/build']
-
     include('/toolkit/toolkit.mozbuild')
 
 elif CONFIG['ENABLE_TESTS']:
     add_tier_dir('testharness', 'testing/mochitest')
 
 if CONFIG['MOZ_EXTENSIONS']:
     add_tier_dir('app', 'extensions')
 
--- a/mobile/android/components/moz.build
+++ b/mobile/android/components/moz.build
@@ -36,8 +36,10 @@ EXTRA_PP_COMPONENTS += [
     'DirectoryProvider.js',
     'HelperAppDialog.js',
     'MobileComponents.manifest',
     'SessionStore.js',
     'Sidebar.js',
 ]
 
 DEFINES['ANDROID_PACKAGE_NAME'] = CONFIG['ANDROID_PACKAGE_NAME']
+
+DIRS += ['build']
--- a/toolkit/toolkit.mozbuild
+++ b/toolkit/toolkit.mozbuild
@@ -148,20 +148,16 @@ if CONFIG['MOZ_PREF_EXTENSIONS']:
 add_tier_dir('platform', 'services')
 add_tier_dir('platform', 'startupcache')
 add_tier_dir('platform', 'js/ductwork/debugger')
 add_tier_dir('platform', 'other-licenses/snappy')
 
 if CONFIG['MOZ_GIO_COMPONENT']:
     add_tier_dir('platform', 'extensions/gio')
 
-# Applications can cheat and ask for code to be
-# built before libxul so it can be linked into libxul.
-add_tier_dir('platform', app_libxul_dirs)
-
 add_tier_dir('platform', 'toolkit/library/StaticXULComponentsEnd')
 add_tier_dir('platform', 'toolkit/library')
 
 if CONFIG['MOZ_REPLACE_MALLOC']:
     add_tier_dir('platform', 'memory/replace')
 
 if CONFIG['NS_TRACE_MALLOC']:
     add_tier_dir('platform', 'tools/trace-malloc')
--- a/xulrunner/app.mozbuild
+++ b/xulrunner/app.mozbuild
@@ -1,14 +1,13 @@
 # vim: set filetype=python:
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-app_libxul_dirs = []
 include('/toolkit/toolkit.mozbuild')
 
 if CONFIG['MOZ_EXTENSIONS']:
     add_tier_dir('app', 'extensions')
 
 if CONFIG['OS_ARCH'] == 'WINNT' and (CONFIG['ENABLE_TESTS'] or
         CONFIG['MOZILLA_OFFICIAL']):
     add_tier_dir('app', 'embedding/tests/winEmbed')