diff options
| author | Ying Wang <wangying@google.com> | 2014-11-03 18:11:53 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-11-03 18:11:53 +0000 |
| commit | f4053c70e4bcf3641fe7bea63fd116c774216a75 (patch) | |
| tree | 7723d569cb169764b04bb345c8b3e1b4e236cea1 /core/prebuilt_internal.mk | |
| parent | 112b32e5351c281e4d82956e476032ccdecdfe7a (diff) | |
| parent | 007026f0ebf2216d875b9fdab44cc68b659e2307 (diff) | |
| download | build-f4053c70e4bcf3641fe7bea63fd116c774216a75.zip build-f4053c70e4bcf3641fe7bea63fd116c774216a75.tar.gz build-f4053c70e4bcf3641fe7bea63fd116c774216a75.tar.bz2 | |
am 007026f0: am 3fe170c5: Merge "Add support for prebuilt AARs." into lmp-mr1-ub-dev
* commit '007026f0ebf2216d875b9fdab44cc68b659e2307':
Add support for prebuilt AARs.
Diffstat (limited to 'core/prebuilt_internal.mk')
| -rw-r--r-- | core/prebuilt_internal.mk | 22 |
1 files changed, 19 insertions, 3 deletions
diff --git a/core/prebuilt_internal.mk b/core/prebuilt_internal.mk index 69f2986..9e942e9 100644 --- a/core/prebuilt_internal.mk +++ b/core/prebuilt_internal.mk @@ -257,10 +257,26 @@ ifeq ($(LOCAL_IS_HOST_MODULE)$(LOCAL_MODULE_CLASS),JAVA_LIBRARIES) # while the deps should be in the common dir, so we make a copy in the common dir. # For nonstatic library, $(common_javalib_jar) is the dependency file, # while $(common_classes_jar) is used to link. -common_classes_jar := $(call intermediates-dir-for,JAVA_LIBRARIES,$(LOCAL_MODULE),,COMMON)/classes.jar -common_javalib_jar := $(dir $(common_classes_jar))javalib.jar +common_classes_jar := $(intermediates.COMMON)/classes.jar +common_javalib_jar := $(intermediates.COMMON)/javalib.jar -$(common_classes_jar) : $(my_prebuilt_src_file) | $(ACP) +$(common_classes_jar) $(common_javalib_jar): PRIVATE_MODULE := $(LOCAL_MODULE) + +ifneq ($(filter %.aar, $(my_prebuilt_src_file)),) +# This is .aar file, archive of classes.jar and Android resources. +my_src_jar := $(intermediates.COMMON)/aar/classes.jar + +$(my_src_jar) : $(my_prebuilt_src_file) + $(hide) rm -rf $(dir $@) && mkdir -p $(dir $@) + $(hide) unzip -qo -d $(dir $@) $< + # Make sure the extracted classes.jar has a new timestamp. + $(hide) touch $@ + +else +# This is jar file. +my_src_jar := $(my_prebuilt_src_file) +endif +$(common_classes_jar) : $(my_src_jar) | $(ACP) $(transform-prebuilt-to-target) $(common_javalib_jar) : $(common_classes_jar) | $(ACP) |