Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-04-03 21:22:47 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 903528 - Pre: Make classes.dex depend on ANDROID_EXTRA_JARS. r=glandium

Browse Source
This commit is contained in:
Nick Alexander 2014-02-24 18:24:45 -08:00
parent 6fb66778ef
commit b75843c7b2
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
config/makefiles/java-build.mk
View File

@ -25,8 +25,10 @@ GENERATED_DIRS += classes
classes.dex: $(call mkdir_deps,classes) classes.dex: $(call mkdir_deps,classes)
classes.dex: R.java classes.dex: R.java
classes.dex: $(ANDROID_APK_NAME).ap_ classes.dex: $(ANDROID_APK_NAME).ap_
classes.dex: $(ANDROID_EXTRA_JARS)
classes.dex: $(JAVAFILES) classes.dex: $(JAVAFILES)
$(JAVAC) $(JAVAC_FLAGS) -d classes $(filter %.java,$^) $(JAVAC) $(JAVAC_FLAGS) -d classes $(filter %.java,$^) \
$(if $(strip $(ANDROID_EXTRA_JARS)),-classpath $(subst $(NULL) ,:,$(strip $(ANDROID_EXTRA_JARS))))
$(DX) --dex --output=$@ classes $(ANDROID_EXTRA_JARS) $(DX) --dex --output=$@ classes $(ANDROID_EXTRA_JARS)
# R.java and $(ANDROID_APK_NAME).ap_ are both produced by aapt. To # R.java and $(ANDROID_APK_NAME).ap_ are both produced by aapt. To
@ -66,9 +68,6 @@ GARBAGE += \
$(NULL) $(NULL)
JAVA_CLASSPATH := $(ANDROID_SDK)/android.jar JAVA_CLASSPATH := $(ANDROID_SDK)/android.jar
ifdef ANDROID_EXTRA_JARS #{
JAVA_CLASSPATH := $(JAVA_CLASSPATH):$(subst $(NULL) ,:,$(strip $(ANDROID_EXTRA_JARS)))
endif #} ANDROID_EXTRA_JARS
# Include Android specific java flags, instead of what's in rules.mk. # Include Android specific java flags, instead of what's in rules.mk.
include $(topsrcdir)/config/android-common.mk include $(topsrcdir)/config/android-common.mk