Bug 1162779 - Move NO_EXPAND_LIBS to moz.build. r=mshal

build/stlport/Makefile.in

@@ -4,10 +4,6 @@
 
 MODULES = stlport
 
-# Force to build a static library, instead of a fake library, without
-# installing it in dist/lib.
-NO_EXPAND_LIBS = 1
-
 include $(topsrcdir)/config/rules.mk
 
 CXXFLAGS += -fuse-cxa-atexit

build/stlport/moz.build

@@ -65,3 +65,7 @@ if CONFIG['GNU_CXX']:
         '-Wno-type-limits',
         '-Wno-unused-local-typedefs',
     ]
+
+# Force to build a static library, instead of a fake library, without
+# installing it in dist/lib.
+NO_EXPAND_LIBS = True

js/src/Makefile.in

@@ -17,7 +17,6 @@ TOPLEVEL_BUILD := 1
 run_for_side_effects := $(shell echo 'MAKE: $(MAKE)')
 
 DIST_INSTALL = 1
-NO_EXPAND_LIBS = 1
 
 ifdef JS_HAS_CTYPES
 ifdef MOZ_NATIVE_FFI

js/src/moz.build

@@ -566,3 +566,5 @@ if CONFIG['OS_ARCH'] == 'SunOS':
 
 if CONFIG['GNU_CXX']:
     FAIL_ON_WARNINGS = True
+
+NO_EXPAND_LIBS = True

python/mozbuild/mozbuild/backend/recursivemake.py

@@ -99,6 +99,7 @@ MOZBUILD_VARIABLES = [
     'MAKE_FRAMEWORK',
     'MODULE',
     'NO_DIST_INSTALL',
+    'NO_EXPAND_LIBS',
     'NO_JS_MANIFEST',
     'OS_LIBS',
     'PARALLEL_DIRS',
@@ -1217,6 +1218,8 @@ INSTALL_TARGETS += %(prefix)s
         backend_file.write('REAL_LIBRARY := %s\n' % libdef.lib_name)
         if libdef.is_sdk:
             backend_file.write('SDK_LIBRARY := %s\n' % libdef.import_name)
+        if libdef.no_expand_lib:
+            backend_file.write('NO_EXPAND_LIBS := 1\n')
 
     def _process_host_library(self, libdef, backend_file):
         backend_file.write('HOST_LIBRARY_NAME = %s\n' % libdef.basename)

python/mozbuild/mozbuild/frontend/context.py

@@ -1404,6 +1404,11 @@ VARIABLES = {
         the path(s) with a '/' character and a '!' character, respectively::
            TEST_HARNESS_FILES.path += ['/build/bar.py', '!quux.py']
         """, 'libs'),
+
+    'NO_EXPAND_LIBS': (bool, bool,
+        """Forces to build a real static library, and no corresponding fake
+           library.
+        """, None),
 }
 
 # Sanity check: we don't want any variable above to have a list as storage type.

python/mozbuild/mozbuild/frontend/data.py

@@ -502,12 +502,14 @@ class StaticLibrary(Library):
     """Context derived container object for a static library"""
     __slots__ = (
         'link_into',
+        'no_expand_lib',
     )
 
     def __init__(self, context, basename, real_name=None, is_sdk=False,
-        link_into=None):
+        link_into=None, no_expand_lib=False):
         Library.__init__(self, context, basename, real_name, is_sdk)
         self.link_into = link_into
+        self.no_expand_lib = no_expand_lib
 
 
 class SharedLibrary(Library):

python/mozbuild/mozbuild/frontend/emitter.py

@@ -456,6 +456,13 @@ class TreeMetadataEmitter(LoggingMixin):
                 elif static_lib:
                     static_args['is_sdk'] = True
 
+            if context.get('NO_EXPAND_LIBS'):
+                if not static_lib:
+                    raise SandboxValidationError(
+                        'NO_EXPAND_LIBS can only be set for static libraries.',
+                        context)
+                static_args['no_expand_lib'] = True
+
             if shared_lib and static_lib:
                 if not static_name and not shared_name:
                     raise SandboxValidationError(

xpcom/glue/Makefile.in

@@ -4,5 +4,3 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 DIST_INSTALL	= 1
-# Force to build a static library only
-NO_EXPAND_LIBS = 1

xpcom/glue/moz.build

@@ -116,3 +116,6 @@ FAIL_ON_WARNINGS = True
 USE_LIBS += [
     'fallible',
 ]
+
+# Force to build a static library only
+NO_EXPAND_LIBS = True

xpcom/glue/standalone/Makefile.in

@@ -4,5 +4,3 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 DIST_INSTALL	= 1
-# Force to build a static library only
-NO_EXPAND_LIBS = 1

xpcom/glue/standalone/moz.build

@@ -49,3 +49,6 @@ FAIL_ON_WARNINGS = True
 USE_LIBS += [
     'fallible',
 ]
+
+# Force to build a static library only
+NO_EXPAND_LIBS = True

xpcom/glue/standalone/staticruntime/Makefile.in

@@ -3,5 +3,3 @@
 # You can obtain one at http://mozilla.org/MPL/2.0/.
 
 DIST_INSTALL	= 1
-# Force to build a static library only
-NO_EXPAND_LIBS = 1

xpcom/glue/standalone/staticruntime/moz.build

@@ -44,3 +44,6 @@ FAIL_ON_WARNINGS = True
 USE_LIBS += [
     'fallible',
 ]
+
+# Force to build a static library only
+NO_EXPAND_LIBS = True

xpcom/glue/staticruntime/Makefile.in

@@ -4,5 +4,3 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 DIST_INSTALL	= 1
-# Force to build a static library only
-NO_EXPAND_LIBS = 1

xpcom/glue/staticruntime/moz.build

@@ -42,3 +42,6 @@ FAIL_ON_WARNINGS = True
 USE_LIBS += [
     'fallible',
 ]
+
+# Force to build a static library only
+NO_EXPAND_LIBS = True