Bug 978591 - Remove per-directory uses of MOZ_CHROME_FILE_FORMAT. r=glandium
authorBrian O'Keefe <bokeefe@alum.wpi.edu>
Thu, 23 Apr 2015 18:43:06 -0400
changeset 273451 3993d39d6b1c69538b62d83fbf11f33461a8573d
parent 273450 ade50933c777e0e38e17ae0e7b9e8159663585ba
child 273452 b42e82ef33d929c3894e77d45a6159b9db35edea
push id863
push userraliiev@mozilla.com
push dateMon, 03 Aug 2015 13:22:43 +0000
treeherdermozilla-release@f6321b14228d [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersglandium
bugs978591
milestone40.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 978591 - Remove per-directory uses of MOZ_CHROME_FILE_FORMAT. r=glandium
python/mozbuild/mozbuild/backend/recursivemake.py
testing/mochitest/Makefile.in
testing/specialpowers/Makefile.in
--- a/python/mozbuild/mozbuild/backend/recursivemake.py
+++ b/python/mozbuild/mozbuild/backend/recursivemake.py
@@ -130,16 +130,17 @@ DEPRECATED_VARIABLES = [
     'MOCHITEST_A11Y_FILES',
     'MOCHITEST_BROWSER_FILES',
     'MOCHITEST_BROWSER_FILES_PARTS',
     'MOCHITEST_CHROME_FILES',
     'MOCHITEST_FILES',
     'MOCHITEST_FILES_PARTS',
     'MOCHITEST_METRO_FILES',
     'MOCHITEST_ROBOCOP_FILES',
+    'MOZ_CHROME_FILE_FORMAT',
     'SHORT_LIBNAME',
     'TESTING_JS_MODULES',
     'TESTING_JS_MODULE_DIR',
 ]
 
 class BackendMakeFile(object):
     """Represents a generated backend.mk file.
 
--- a/testing/mochitest/Makefile.in
+++ b/testing/mochitest/Makefile.in
@@ -1,14 +1,13 @@
 #
 # 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/.
 
-MOZ_CHROME_FILE_FORMAT = jar
 
 _DEST_DIR = $(DEPTH)/_tests/$(relativesrcdir)
 
 include $(topsrcdir)/config/rules.mk
 # We're installing to _tests/testing/mochitest, so this is the depth
 # necessary for relative objdir paths.
 TARGET_DEPTH = ../../..
 include $(topsrcdir)/build/automation-build.mk
--- a/testing/specialpowers/Makefile.in
+++ b/testing/specialpowers/Makefile.in
@@ -1,14 +1,13 @@
 #
 # 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/.
 
-MOZ_CHROME_FILE_FORMAT = flat
 
 TEST_EXTENSIONS_DIR = $(DEPTH)/testing/specialpowers
 
 include $(topsrcdir)/config/rules.mk
 
 libs-preqs = \
   $(call mkdir_deps,$(TEST_EXTENSIONS_DIR)) \
   $(NULL)