diff options
| author | Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de> | 2016-02-03 12:23:07 +0100 |
|---|---|---|
| committer | Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de> | 2016-02-03 12:23:07 +0100 |
| commit | 5b2d5516ff1443a7f6eca087b430e6e47f7393f4 (patch) | |
| tree | ce44be2d4a37b302e7e675a135a5187f82232808 /build | |
| parent | 46b133c04103ff2e2d5c98710a1e1ec8dbc5efc5 (diff) | |
| parent | 34b5b9756cdc86ab9491938c8519b7ae8beecb6d (diff) | |
| download | vendor_replicant-5b2d5516ff1443a7f6eca087b430e6e47f7393f4.zip vendor_replicant-5b2d5516ff1443a7f6eca087b430e6e47f7393f4.tar.gz vendor_replicant-5b2d5516ff1443a7f6eca087b430e6e47f7393f4.tar.bz2 | |
Merge branch 'cm-13.0' of https://github.com/CyanogenMod/android_vendor_cm into replicant-6.0
Signed-off-by: Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de>
Conflicts:
overlay/common/frameworks/base/core/res/res/drawable-nodpi/default_wallpaper.jpg
overlay/common/frameworks/base/core/res/res/drawable-sw600dp-nodpi/default_wallpaper.jpg
overlay/common/frameworks/base/core/res/res/drawable-sw720dp-nodpi/default_wallpaper.jpg
overlay/common/frameworks/base/core/res/res/drawable-xhdpi/default_wallpaper.jpg
Diffstat (limited to 'build')
| -rw-r--r-- | build/core/maven_artifact.mk | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/build/core/maven_artifact.mk b/build/core/maven_artifact.mk index 08491d2..3f8e7fd 100644 --- a/build/core/maven_artifact.mk +++ b/build/core/maven_artifact.mk @@ -50,7 +50,20 @@ $(LOCAL_PREBUILT_MODULE_FILE): -DoutputDirectory=$(dir $@) @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. +$(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) |