Bug 1162852 - Remove EXTRA_ASSEMBLER_FLAGS. r=gps

config/config.mk

@@ -435,7 +435,7 @@ COMPILE_CFLAGS	= $(VISIBILITY_FLAGS) $(DEFINES) $(INCLUDES) $(OS_INCLUDES) $(DSO
 COMPILE_CXXFLAGS = $(if $(DISABLE_STL_WRAPPING),,$(STL_FLAGS)) $(VISIBILITY_FLAGS) $(DEFINES) $(INCLUDES) $(OS_INCLUDES) $(DSO_CFLAGS) $(DSO_PIC_CFLAGS) $(RTL_FLAGS) $(OS_CPPFLAGS) $(OS_COMPILE_CXXFLAGS) $(CXXFLAGS) $(MOZBUILD_CXXFLAGS)
 COMPILE_CMFLAGS = $(OS_COMPILE_CMFLAGS) $(MOZBUILD_CMFLAGS)
 COMPILE_CMMFLAGS = $(OS_COMPILE_CMMFLAGS) $(MOZBUILD_CMMFLAGS)
-ASFLAGS += $(MOZBUILD_ASFLAGS) $(EXTRA_ASSEMBLER_FLAGS)
+ASFLAGS += $(MOZBUILD_ASFLAGS)
 
 ifndef CROSS_COMPILE
 HOST_CFLAGS += $(RTL_FLAGS)

python/mozbuild/mozbuild/frontend/emitter.py

@@ -554,7 +554,6 @@ class TreeMetadataEmitter(LoggingMixin):
             'ANDROID_GENERATED_RESFILES',
             'ANDROID_RES_DIRS',
             'DISABLE_STL_WRAPPING',
-            'EXTRA_ASSEMBLER_FLAGS',
             'EXTRA_COMPONENTS',
             'EXTRA_DSO_LDOPTS',
             'EXTRA_PP_COMPONENTS',

python/mozbuild/mozbuild/frontend/gyp_reader.py

@@ -71,9 +71,7 @@ class GypContext(TemplateContext):
         """Returns the allowed variables for a GypContext."""
         # Using a class method instead of a class variable to hide the content
         # from sphinx.
-        return dict(VARIABLES,
-        EXTRA_ASSEMBLER_FLAGS=(List, list, '', None),
-    )
+        return dict(VARIABLES)
 
 
 def encode(value):
@@ -203,7 +201,7 @@ def read_from_gyp(config, path, output, vars, non_unified_sources = set()):
                     continue
                 context['LOCAL_INCLUDES'] += [include]
 
-            context['EXTRA_ASSEMBLER_FLAGS'] = target_conf.get('asflags_mozilla', [])
+            context['ASFLAGS'] = target_conf.get('asflags_mozilla', [])
             flags = target_conf.get('cflags_mozilla', [])
             if flags:
                 suffix_map = {