diff options
| author | Ying Wang <wangying@google.com> | 2010-09-24 18:09:04 -0700 |
|---|---|---|
| committer | Ying Wang <wangying@google.com> | 2010-10-01 14:41:43 -0700 |
| commit | a83940fa7851b35712e559be2246b56b5666b805 (patch) | |
| tree | 1eccf193244ca721dc484f30a2a4398a6274a14d /core/prebuilt.mk | |
| parent | 46fc2341c535ba624fd2dceec9399ce681a80866 (diff) | |
| download | build-a83940fa7851b35712e559be2246b56b5666b805.zip build-a83940fa7851b35712e559be2246b56b5666b805.tar.gz build-a83940fa7851b35712e559be2246b56b5666b805.tar.bz2 | |
Move odex related files to product-specific dir.
For target Java libraries, now the LOCAL_BUILT_MODULE includes both javalib.jar
and the .odex file, if dexpreopt is enabled.
These 2 files are moved to a product-specific dir in this change.
For target Java Libraries, $(intermediates) now points to the product-specific dir.
There is still a javalib.jar in the $(intermediates.COMMON) dir, which is used as dependency.
Nothing is changed for host Java libraries.
Change-Id: I2546dbb940c74537864ca002d1acb49bb731fbbc
Diffstat (limited to 'core/prebuilt.mk')
| -rw-r--r-- | core/prebuilt.mk | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/core/prebuilt.mk b/core/prebuilt.mk index b03f2af..b4717e0 100644 --- a/core/prebuilt.mk +++ b/core/prebuilt.mk @@ -42,6 +42,14 @@ $(LOCAL_BUILT_MODULE) : $(LOCAL_PATH)/$(LOCAL_SRC_FILES) | $(ACP) endif endif +ifeq ($(LOCAL_IS_HOST_MODULE)$(LOCAL_MODULE_CLASS),JAVA_LIBRARIES) +# for target java libraries, the LOCAL_BUILT_MODULE is in a product-specific dir, +# while the deps should be in the common dir, so we make a copy in the common dir. +common_library_jar := $(call intermediates-dir-for,JAVA_LIBRARIES,$(LOCAL_MODULE),,COMMON)/$(notdir $(LOCAL_BUILT_MODULE)) +$(common_library_jar) : $(LOCAL_PATH)/$(LOCAL_SRC_FILES) | $(ACP) + $(transform-prebuilt-to-target) +endif + ifeq ($(LOCAL_CERTIFICATE),EXTERNAL) # The magic string "EXTERNAL" means this package will be signed with # the test key throughout the build process, but we expect the final |