From 2a6275c3107f4863e4464f4599e00a9f979a377a Mon Sep 17 00:00:00 2001 From: Brian O'Keefe Date: Thu, 23 Apr 2015 18:43:06 -0400 Subject: [PATCH] Bug 978591 - Remove per-directory uses of MOZ_CHROME_FILE_FORMAT. r=glandium --HG-- extra : rebase_source : 15031044bb2be11e69848ddebc3e40315dda3cb1 --- python/mozbuild/mozbuild/backend/recursivemake.py | 1 + testing/mochitest/Makefile.in | 1 - testing/specialpowers/Makefile.in | 1 - 3 files changed, 1 insertion(+), 2 deletions(-) diff --git a/python/mozbuild/mozbuild/backend/recursivemake.py b/python/mozbuild/mozbuild/backend/recursivemake.py index 2138e593bad5..c64e73914ccd 100644 --- a/python/mozbuild/mozbuild/backend/recursivemake.py +++ b/python/mozbuild/mozbuild/backend/recursivemake.py @@ -135,6 +135,7 @@ DEPRECATED_VARIABLES = [ 'MOCHITEST_FILES_PARTS', 'MOCHITEST_METRO_FILES', 'MOCHITEST_ROBOCOP_FILES', + 'MOZ_CHROME_FILE_FORMAT', 'SHORT_LIBNAME', 'TESTING_JS_MODULES', 'TESTING_JS_MODULE_DIR', diff --git a/testing/mochitest/Makefile.in b/testing/mochitest/Makefile.in index 7f30eab97a49..dbba13a599b0 100644 --- a/testing/mochitest/Makefile.in +++ b/testing/mochitest/Makefile.in @@ -3,7 +3,6 @@ # 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) diff --git a/testing/specialpowers/Makefile.in b/testing/specialpowers/Makefile.in index bc041636c2db..b20132f62ba6 100644 --- a/testing/specialpowers/Makefile.in +++ b/testing/specialpowers/Makefile.in @@ -3,7 +3,6 @@ # 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