ADHOC/replicant-vendor_replicant
3
0
Fork 0
Code Issues 6 Pull Requests Releases Activity

Fixed mmm For Maven APK

Browse Source 
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
This commit is contained in:
herriojr 2016-01-18 10:32:36 -08:00
parent fc52e707e8
commit f0a6f1ec8b
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build/core/maven_artifact.mk
View File

@ -51,6 +51,7 @@ $(LOCAL_PREBUILT_MODULE_FILE):
@echo -e ${CL_GRN}"Download:"${CL_RST}" $@" @echo -e ${CL_GRN}"Download:"${CL_RST}" $@"
ifneq ($(filter-out disabled, $(LOCAL_JACK_ENABLED)),) 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 # 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 # 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. # 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 # 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 # 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 $(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 endif # LOCAL_JACK_ENABLED is full or partial
include $(BUILD_PREBUILT) include $(BUILD_PREBUILT)
# the "fetchprebuilts" target will go through and pre-download all of the maven dependencies in the tree # the "fetchprebuilts" target will go through and pre-download all of the maven dependencies in the tree
fetchprebuilts: $(LOCAL_PREBUILT_MODULE_FILE) fetchprebuilts: $(LOCAL_PREBUILT_MODULE_FILE)