Bug 1195388 - Pre: Clean GARBAGE and dependencies. r?gps draft
authorNick Alexander <nalexander@mozilla.com>
Mon, 10 Aug 2015 14:25:07 -0700
changeset 285591 c6813dad0031057035ed2010e5effd96b1b8ffba
parent 285590 76a433881e4b344ec306456932e1f81416d790a1
child 285592 6f48b57bb34839067459fe8832e15349a58f79de
push id4466
push usernalexander@mozilla.com
push dateMon, 17 Aug 2015 16:51:24 +0000
reviewersgps
bugs1195388
milestone43.0a1
Bug 1195388 - Pre: Clean GARBAGE and dependencies. r?gps GARBAGE is set automatically by PP_TARGETS. The fragment does not need to be preprocessed at all, since it is itself included in a preprocessed file. Including the fragment in all_resources is therefore not needed, since it is just itself included in a file.
mobile/android/base/Makefile.in
--- a/mobile/android/base/Makefile.in
+++ b/mobile/android/base/Makefile.in
@@ -16,18 +16,16 @@ DEFINES += \
   -DANDROID_VERSION_CODE=$(ANDROID_VERSION_CODE) \
   -DMOZ_ANDROID_SHARED_ID="$(MOZ_ANDROID_SHARED_ID)" \
   -DMOZ_ANDROID_SHARED_ACCOUNT_TYPE="$(MOZ_ANDROID_SHARED_ACCOUNT_TYPE)" \
   -DMOZ_ANDROID_SHARED_FXACCOUNT_TYPE="$(MOZ_ANDROID_SHARED_FXACCOUNT_TYPE)" \
   -DMOZ_APP_BUILDID=$(MOZ_APP_BUILDID) \
   $(NULL)
 
 GARBAGE += \
-  AndroidManifest.xml  \
-  WebappManifestFragment.xml.frag \
   classes.dex  \
   gecko.ap_  \
   res/values/strings.xml \
   res/raw/browsersearch.json \
   res/raw/suggestedsites.json \
   .aapt.deps \
   javah.out \
   jni-stubs.inc \
@@ -218,17 +216,16 @@ ANNOTATION_PROCESSOR_JAR_FILES := $(DEPT
 # This annotation processing step also generates
 # GeneratedJNIWrappers.h and GeneratedJNINatives.h
 GeneratedJNIWrappers.cpp: $(ANNOTATION_PROCESSOR_JAR_FILES)
 GeneratedJNIWrappers.cpp: $(ALL_JARS)
 	$(JAVA) -classpath constants.jar:$(JAVA_BOOTCLASSPATH):$(JAVA_CLASSPATH):$(ANNOTATION_PROCESSOR_JAR_FILES) org.mozilla.gecko.annotationProcessors.AnnotationProcessor $(ALL_JARS)
 
 manifest := \
   AndroidManifest.xml.in \
-  WebappManifestFragment.xml.frag.in \
   fennec_ids.txt.in \
   $(NULL)
 
 PP_TARGETS += manifest
 
 # Certain source files need to be preprocessed.  This special rule
 # generates these files into generated/org/mozilla/gecko for
 # consumption by the build system and IDEs.
@@ -312,17 +309,16 @@ android_res_files := $(filter-out $(not_
 # recipe: defining no recipe at all causes Make to treat the target
 # differently, in a way that defeats our dependencies.
 res/values/strings.xml: .locales.deps ;
 res/raw/browsersearch.json: .locales.deps ;
 res/raw/suggestedsites.json: .locales.deps ;
 
 all_resources = \
   $(CURDIR)/AndroidManifest.xml \
-  $(CURDIR)/WebappManifestFragment.xml.frag \
   $(android_res_files) \
   $(ANDROID_GENERATED_RESFILES) \
   $(NULL)
 
 # For GeckoView, we want a zip of an Android res/ directory that
 # merges the contents of all the ANDROID_RES_DIRS.  The inner res/
 # directory must have the Android resource two-layer hierarchy.