Bug 989522 - Remove LIBXUL_LIBRARY from the moz.build sandbox. r=mshal

config/config.mk

@@ -55,7 +55,6 @@ _MOZBUILD_EXTERNAL_VARIABLES := \
   JAVA_JAR_TARGETS \
   JS_MODULES_PATH \
   LIBRARY_NAME \
-  LIBXUL_LIBRARY \
   MODULE \
   MSVC_ENABLE_PGO \
   NO_DIST_INSTALL \
@@ -73,6 +72,7 @@ _MOZBUILD_EXTERNAL_VARIABLES := \
 
 _DEPRECATED_VARIABLES := \
   ANDROID_RESFILES \
+  LIBXUL_LIBRARY \
   MOCHITEST_A11Y_FILES \
   MOCHITEST_BROWSER_FILES \
   MOCHITEST_BROWSER_FILES_PARTS \
@@ -341,9 +341,6 @@ _ENABLE_PIC=1
 # to be merged into libxul
 
 ifneq (,$(filter xul xul-%,$(FINAL_LIBRARY) $(LIBRARY_NAME)))
-  ifdef LIBXUL_LIBRARY
-    $(error LIBRARY_NAME or FINAL_LIBRARY is "xul", LIBXUL_LIBRARY is implied)
-  endif
   LIBXUL_LIBRARY := 1
 endif
 

dom/bindings/test/moz.build

@@ -4,7 +4,11 @@
 # 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/.
 
-LIBXUL_LIBRARY = True
+DEFINES.update({
+    'IMPL_LIBXUL': True,
+    'MOZILLA_INTERNAL_API': True,
+})
+
 # Do NOT export this library.  We don't actually want our test code
 # being added to libxul or anything.
 

python/mozbuild/mozbuild/frontend/emitter.py

@@ -206,9 +206,6 @@ class TreeMetadataEmitter(LoggingMixin):
                         'doesn\'t exist in %s (%s) in %s'
                         % (symbol, src, sandbox['RELATIVEDIR']))
 
-        if sandbox.get('LIBXUL_LIBRARY') and sandbox.get('FORCE_STATIC_LIB'):
-            raise SandboxValidationError('LIBXUL_LIBRARY implies FORCE_STATIC_LIB')
-
         # Proxy some variables as-is until we have richer classes to represent
         # them. We should aim to keep this set small because it violates the
         # desired abstraction of the build definition away from makefiles.
@@ -237,7 +234,6 @@ class TreeMetadataEmitter(LoggingMixin):
             'IS_GYP_DIR',
             'JS_MODULES_PATH',
             'LIBS',
-            'LIBXUL_LIBRARY',
             'MSVC_ENABLE_PGO',
             'NO_DIST_INSTALL',
             'OS_LIBS',

python/mozbuild/mozbuild/frontend/sandbox_symbols.py

@@ -314,13 +314,6 @@ VARIABLES = {
         A list of libraries and flags to include when linking.
         """, None),
 
-    'LIBXUL_LIBRARY': (bool, bool,
-        """Whether the library in this directory is linked into libxul.
-
-        Implies ``FORCE_STATIC_LIB`` and the ``MOZILLA_INTERNAL_API``
-        preprocessor macro.
-        """, None),
-
     'LOCAL_INCLUDES': (StrictOrderingOnAppendList, list,
         """Additional directories to be searched for include files by the compiler.
         """, None),

python/mozbuild/mozbuild/test/backend/data/variable_passthru/moz.build

@@ -30,7 +30,6 @@ SOURCES += ['bar.mm', 'foo.mm']
 SOURCES += ['baz.S', 'foo.S']
 
 FAIL_ON_WARNINGS = True
-LIBXUL_LIBRARY = True
 MSVC_ENABLE_PGO = True
 NO_VISIBILITY_FLAGS = True
 

python/mozbuild/mozbuild/test/backend/test_recursivemake.py

@@ -302,9 +302,6 @@ class TestRecursiveMakeBackend(BackendTester):
             'HOST_LIBRARY_NAME': [
                 'HOST_LIBRARY_NAME := host_bar',
             ],
-            'LIBXUL_LIBRARY': [
-                'LIBXUL_LIBRARY := 1',
-            ],
             'MSVC_ENABLE_PGO': [
                 'MSVC_ENABLE_PGO := 1',
             ],

python/mozbuild/mozbuild/test/frontend/data/variable-passthru/moz.build

@@ -30,7 +30,6 @@ SOURCES += ['fans.mm', 'tans.mm']
 SOURCES += ['bans.S', 'fans.S']
 
 FAIL_ON_WARNINGS = True
-LIBXUL_LIBRARY = True
 MSVC_ENABLE_PGO = True
 
 NO_DIST_INSTALL = True

python/mozbuild/mozbuild/test/frontend/test_emitter.py

@@ -164,7 +164,6 @@ class TestEmitterBasic(unittest.TestCase):
             HOST_LIBRARY_NAME='host_fans',
             IS_COMPONENT=True,
             LIBS=['fans.lib', 'tans.lib'],
-            LIBXUL_LIBRARY=True,
             MSVC_ENABLE_PGO=True,
             NO_DIST_INSTALL=True,
             OS_LIBS=['foo.so', '-l123', 'aaa.a'],