From 3e3c3f1ca4e202ad4f5dcf2d09eb0e6f4dcc99b0 Mon Sep 17 00:00:00 2001 From: Mike Hommey Date: Wed, 20 Jan 2016 08:01:42 +0900 Subject: [PATCH] Backout changeset de0a7a1cdc4a from bug 1240660 for make package bustage on a CLOSED TREE --- browser/locales/Makefile.in | 2 +- config/rules.mk | 2 +- python/mozbuild/mozbuild/frontend/context.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/browser/locales/Makefile.in b/browser/locales/Makefile.in index 31c2d290f01..6f75776caf6 100644 --- a/browser/locales/Makefile.in +++ b/browser/locales/Makefile.in @@ -74,7 +74,7 @@ PP_TARGETS += SEARCHPLUGINS list-txt = $(SEARCHPLUGINS_PATH)/list.txt GARBAGE += $(list-txt) -misc:: searchplugins +libs:: searchplugins # Required for l10n.mk - defines a list of app sub dirs that should # be included in langpack xpis. diff --git a/config/rules.mk b/config/rules.mk index 6a4120cb786..5fb2a9065d2 100644 --- a/config/rules.mk +++ b/config/rules.mk @@ -1216,7 +1216,7 @@ endif endif endif -misc realchrome:: $(FINAL_TARGET)/chrome +libs realchrome:: $(FINAL_TARGET)/chrome $(call py_action,jar_maker,\ $(QUIET) -d $(FINAL_TARGET) \ $(MAKE_JARS_FLAGS) $(DEFINES) $(ACDEFINES) \ diff --git a/python/mozbuild/mozbuild/frontend/context.py b/python/mozbuild/mozbuild/frontend/context.py index a909465f67c..c8d9a1dba2b 100644 --- a/python/mozbuild/mozbuild/frontend/context.py +++ b/python/mozbuild/mozbuild/frontend/context.py @@ -1354,7 +1354,7 @@ VARIABLES = { JAR manifests are files in the tree that define how to package files into JARs and how chrome registration is performed. For more info, see :ref:`jar_manifests`. - """, 'misc'), + """, 'libs'), # IDL Generation. 'XPIDL_SOURCES': (StrictOrderingOnAppendList, list,