Bug 1195388 - Pre: Clean GARBAGE and dependencies. r=gps
authorNick Alexander <nalexander@mozilla.com>
Mon, 10 Aug 2015 14:25:07 -0700
changeset 258501 3e09f5f7e0667c78ba7e5ce670ab49d6caf351cb
parent 258500 9e2ab57664c2ced7af31e2f218fd4f6b4168a0fe
child 258502 6480a988c996db6de0ed9b1eb648fc54829ae947
push id29257
push userkwierso@gmail.com
push dateThu, 20 Aug 2015 19:28:18 +0000
treeherdermozilla-central@7a6cd1616542 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersgps
bugs1195388
milestone43.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 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.