Bug 946083 - Part 2: Add dependencies for Proguard input jars. r=glandium
authorNick Alexander <nalexander@mozilla.com>
Tue, 11 Feb 2014 09:55:47 -0800
changeset 168097 1a05d8dffc6541b985d4495bacc41d87303031f9
parent 168096 5c68bbcef1abeec86d0b2e51ec842f51907a9155
child 168098 9ef576b3af3f7fc416a6a1fa6c08ba7f859b3fd3
push id39653
push usernalexander@mozilla.com
push dateTue, 11 Feb 2014 19:29:00 +0000
treeherdermozilla-inbound@1a05d8dffc65 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersglandium
bugs946083
milestone30.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 946083 - Part 2: Add dependencies for Proguard input jars. r=glandium This restores no-op builds.
mobile/android/base/Makefile.in
--- a/mobile/android/base/Makefile.in
+++ b/mobile/android/base/Makefile.in
@@ -76,32 +76,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)