diff options
| author | Nick Kralevich <nnk@google.com> | 2014-11-02 16:53:29 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-11-02 16:53:29 +0000 |
| commit | 0a5105bd25fea456b5771520a532e2fce68c8c0a (patch) | |
| tree | 1e88fb6945257b5850e4c8282226feaab0514250 /core/prebuilt_internal.mk | |
| parent | 5b3b4b86c59668fc17078ed7a8d3234cbc7b9e8c (diff) | |
| parent | e4cbc2af5f476d9eb875253584260bed807acddf (diff) | |
| download | build-0a5105bd25fea456b5771520a532e2fce68c8c0a.zip build-0a5105bd25fea456b5771520a532e2fce68c8c0a.tar.gz build-0a5105bd25fea456b5771520a532e2fce68c8c0a.tar.bz2 | |
am e4cbc2af: Merge "Revert "Add support for prebuilt AARs."" into lmp-mr1-ub-dev
* commit 'e4cbc2af5f476d9eb875253584260bed807acddf':
Revert "Add support for prebuilt AARs."
Diffstat (limited to 'core/prebuilt_internal.mk')
| -rw-r--r-- | core/prebuilt_internal.mk | 22 |
1 files changed, 3 insertions, 19 deletions
diff --git a/core/prebuilt_internal.mk b/core/prebuilt_internal.mk index 96d3280..7e1ea4b 100644 --- a/core/prebuilt_internal.mk +++ b/core/prebuilt_internal.mk @@ -250,26 +250,10 @@ 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 := $(intermediates.COMMON)/classes.jar -common_javalib_jar := $(intermediates.COMMON)/javalib.jar +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) $(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) +$(common_classes_jar) : $(my_prebuilt_src_file) | $(ACP) $(transform-prebuilt-to-target) $(common_javalib_jar) : $(common_classes_jar) | $(ACP) |