wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 946083 - Part 2: Add dependencies for Proguard input jars. r=glandium

Browse Source 
This restores no-op builds.

--HG--
extra : rebase_source : 0a3554f9d7070c3448eaf9536e18adab6b5781d6
This commit is contained in:
Nick Alexander 2014-02-11 09:55:47 -08:00
parent ec132ddcf5
commit 747b08c100
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
mobile/android/base/Makefile.in
View File

@ -81,8 +81,8 @@ include $(topsrcdir)/config/config.mk
# 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
@ -95,8 +95,15 @@ else
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 \