diff options
| author | herriojr <jherriott@cyngn.com> | 2016-01-15 15:44:50 -0800 |
|---|---|---|
| committer | herriojr <jherriott@cyngn.com> | 2016-01-15 16:58:02 -0800 |
| commit | 04864b10aa4d409eec0bdf47f410c0aab5237c68 (patch) | |
| tree | 9e9fc9c76535861749dd843dc0b2e7acedbc3f78 /build | |
| parent | 356bb564429d19e7857a68fd71d15641a19a744a (diff) | |
| download | vendor_replicant-04864b10aa4d409eec0bdf47f410c0aab5237c68.zip vendor_replicant-04864b10aa4d409eec0bdf47f410c0aab5237c68.tar.gz vendor_replicant-04864b10aa4d409eec0bdf47f410c0aab5237c68.tar.bz2 | |
Fixed Maven Artifactory to work with jack
Prebuilts weren't generating their .jack file when doing an mm or mmm
but would work with a brunch or full make. This makes it so mmm/mm
will properly generate it.
Change-Id: If5ccd1b557ef124b3c57fa09b172ec11caff886e
Diffstat (limited to 'build')
| -rw-r--r-- | build/core/maven_artifact.mk | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/build/core/maven_artifact.mk b/build/core/maven_artifact.mk index 08491d2..5f6a2a1 100644 --- a/build/core/maven_artifact.mk +++ b/build/core/maven_artifact.mk @@ -50,6 +50,17 @@ $(LOCAL_PREBUILT_MODULE_FILE): -DoutputDirectory=$(dir $@) @echo -e ${CL_GRN}"Download:"${CL_RST}" $@" +ifneq ($(filter-out disabled, $(LOCAL_JACK_ENABLED)),) +# 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. +$(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_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 |