Bug 718928 - AndroidManifest.xml does not depend on Sync manifest include fragments. r=ted, a=akeybl
authorRichard Newman <rnewman@mozilla.com>
Wed, 25 Jan 2012 15:53:13 -0800
changeset 84220 b314edef7cbfa1b4f4b8dbf5193567e83dc47c29
parent 84219 2a12d4f824f416e01313c01c761f72c614ba4964
child 84221 d786e7c31177ae6f2d27267d759cea71ed28ad74
push id775
push userrnewman@mozilla.com
push dateThu, 26 Jan 2012 04:30:14 +0000
treeherdermozilla-aurora@b310cea4258c [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersted, akeybl
bugs718928
milestone11.0a2
Bug 718928 - AndroidManifest.xml does not depend on Sync manifest include fragments. r=ted, a=akeybl
mobile/android/base/Makefile.in
--- a/mobile/android/base/Makefile.in
+++ b/mobile/android/base/Makefile.in
@@ -572,17 +572,20 @@ classes.dex: $(JAVAFILES) $(PROCESSEDJAV
 	$(DX) --dex --output=$@ classes
 
 PP_RES_XML=$(SYNC_PP_RES_XML)
 
 $(PP_RES_XML): $(subst res/,$(srcdir)/resources/, $(PP_RES_XML).in)
 	$(PYTHON) $(topsrcdir)/config/Preprocessor.py \
              $(AUTOMATION_PPARGS) $(DEFINES) $(ACDEFINES) $< > $@
 
-AndroidManifest.xml $(PROCESSEDJAVAFILES) package-name.txt: % : %.in Makefile.in
+# AndroidManifest.xml includes these files, so they need to be marked as dependencies.
+SYNC_MANIFEST_FRAGMENTS = $(wildcard $(topsrcdir)/mobile/android/sync/manifests/*.in)
+
+AndroidManifest.xml $(PROCESSEDJAVAFILES) package-name.txt: % : %.in Makefile.in $(SYNC_MANIFEST_FRAGMENTS)
 	mkdir -p db sync/repositories/android
 	$(PYTHON) $(topsrcdir)/config/Preprocessor.py \
              $(AUTOMATION_PPARGS) $(DEFINES) $(ACDEFINES) $< > $@
 
 res/drawable/icon.png: $(MOZ_APP_ICON)
 	$(NSINSTALL) -D res/drawable
 	cp $(ICON_PATH) $@