diff options
| author | herriojr <jherriott@cyngn.com> | 2016-01-18 10:32:36 -0800 |
|---|---|---|
| committer | herriojr <jherriott@cyngn.com> | 2016-01-18 10:32:36 -0800 |
| commit | f0a6f1ec8bb78d53cb8f3f1e5ac8037e16d2e0c6 (patch) | |
| tree | ff721b859dd404090573191883c1ee920c5aae98 /build/core | |
| parent | fc52e707e8e448f476b856ce7d4ff6abed9e85fb (diff) | |
| download | vendor_replicant-f0a6f1ec8bb78d53cb8f3f1e5ac8037e16d2e0c6.zip vendor_replicant-f0a6f1ec8bb78d53cb8f3f1e5ac8037e16d2e0c6.tar.gz vendor_replicant-f0a6f1ec8bb78d53cb8f3f1e5ac8037e16d2e0c6.tar.bz2 | |
Fixed mmm For Maven APK
Maven APK (Why are these in maven anyways?) will crash due to it not
needing to generate a jack file. This wasn't noticed before as brunch
succeeded, however, doing an mmm on one will cause this to fail. This
adds in logic to not generate a jack file for an apk in maven.
Change-Id: I44036bfd51ae3edd9437b153898b419ffc6ba2d6
Diffstat (limited to 'build/core')
| -rw-r--r-- | build/core/maven_artifact.mk | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/build/core/maven_artifact.mk b/build/core/maven_artifact.mk index 5f6a2a1..3f8e7fd 100644 --- a/build/core/maven_artifact.mk +++ b/build/core/maven_artifact.mk @@ -51,6 +51,7 @@ $(LOCAL_PREBUILT_MODULE_FILE): @echo -e ${CL_GRN}"Download:"${CL_RST}" $@" ifneq ($(filter-out disabled, $(LOCAL_JACK_ENABLED)),) +ifneq ($(LOCAL_MAVEN_PACKAGING),apk) # This is required to be defined before the LOCAL_MODULES target below gets defined, it's a NOOP registered again in # BUILD_PREBUILT. This is done because BUILD_PREBUILT doesn't actually handle generating the .jack files properly and # only generates a target but doesn't set the LOCAL_MODULE dependent on it. @@ -59,9 +60,10 @@ $(call intermediates-dir-for,JAVA_LIBRARIES,$(LOCAL_MODULE),,COMMON): # This adds another step required for LOCAL_MODULE to be completed -- generating the jack file, it just so happens # to be built when doing a brunch, but not when doing an mmm, so this makes it work with both $(LOCAL_MODULE): $(call intermediates-dir-for,JAVA_LIBRARIES,$(LOCAL_MODULE),,COMMON)/classes.jack +endif # LOCAL_MAVEN_PACKING is not apk endif # LOCAL_JACK_ENABLED is full or partial include $(BUILD_PREBUILT) # the "fetchprebuilts" target will go through and pre-download all of the maven dependencies in the tree -fetchprebuilts: $(LOCAL_PREBUILT_MODULE_FILE)
\ No newline at end of file +fetchprebuilts: $(LOCAL_PREBUILT_MODULE_FILE) |