Bug 946083 - Part 2: Add dependencies for Proguard input jars. r=glandium, a=sylvestre
authorNick Alexander <nalexander@mozilla.com>
Tue, 11 Feb 2014 09:55:47 -0800
changeset 177122 d37272b4e6c8d5a868ea96a245faa463c3e4efbb
parent 177121 81965a501118db3f9bb7c099597fed00b985f4c5
child 177123 b7959eada410f9441b8cd26e9d9f7807ecd4c74a
push id5263
push usernalexander@mozilla.com
push dateWed, 19 Feb 2014 16:56:26 +0000
treeherdermozilla-aurora@d37272b4e6c8 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersglandium, sylvestre
bugs946083
milestone29.0a2
Bug 946083 - Part 2: Add dependencies for Proguard input jars. r=glandium, a=sylvestre This restores no-op builds.
mobile/android/base/Makefile.in
--- a/mobile/android/base/Makefile.in
+++ b/mobile/android/base/Makefile.in
@@ -73,32 +73,39 @@ endif
 include $(topsrcdir)/config/config.mk
 
 # Note that we're going to set up a dependency directly between embed_android.dex and the java files
 # Instead of on the .class files, since more than one .class file might be produced per .java file
 # Sync dependencies are provided in a single jar. Sync classes themselves are delivered as source,
 # because Android resource classes must be compiled together in order to avoid overlapping resource
 # indices.
 
-classes.dex: proguard-jars
-	@echo 'DX classes.dex'
+classes.dex: .proguard.deps
+	$(REPORT_BUILD)
 	$(DX) --dex --output=classes.dex jars-proguarded $(ANDROID_COMPAT_LIB)
 
 ifdef MOZ_DISABLE_PROGUARD
   PROGUARD_PASSES=0
 else
   ifdef MOZ_DEBUG
   PROGUARD_PASSES=1
   else
   PROGUARD_PASSES=6
   endif
 endif
 
-proguard-jars: $(ALL_JARS)
-	java -jar $(ANDROID_SDK_ROOT)/tools/proguard/lib/proguard.jar @$(topsrcdir)/mobile/android/config/proguard.cfg -optimizationpasses $(PROGUARD_PASSES) -injars $(subst ::,:,$(subst $(NULL) ,:,$(strip $(ALL_JARS)))) -outjars jars-proguarded -libraryjars $(ANDROID_SDK)/android.jar:$(ANDROID_COMPAT_LIB)
+.proguard.deps: $(ALL_JARS)
+	$(REPORT_BUILD)
+	java -jar $(ANDROID_SDK_ROOT)/tools/proguard/lib/proguard.jar \
+		@$(topsrcdir)/mobile/android/config/proguard.cfg \
+		-optimizationpasses $(PROGUARD_PASSES) \
+		-injars $(subst ::,:,$(subst $(NULL) ,:,$(strip $(ALL_JARS)))) \
+		-outjars jars-proguarded \
+		-libraryjars $(ANDROID_SDK)/android.jar:$(ANDROID_COMPAT_LIB)
+	@$(TOUCH) $@
 
 CLASSES_WITH_JNI= \
     org.mozilla.gecko.GeckoAppShell \
     org.mozilla.gecko.GeckoJavaSampler \
     org.mozilla.gecko.gfx.NativePanZoomController \
     org.mozilla.gecko.ANRReporter \
     $(NULL)