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/dex_preopt.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/dex_preopt.mk')
| -rw-r--r-- | core/dex_preopt.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/dex_preopt.mk b/core/dex_preopt.mk index 0e151bd..6e0b093 100644 --- a/core/dex_preopt.mk +++ b/core/dex_preopt.mk @@ -45,7 +45,7 @@ define _dexpreopt-boot-jar $(eval _dbj_jar := $(DEXPREOPT_BOOT_JAR_DIR_FULL_PATH)/$(1).jar) $(eval _dbj_odex := $(DEXPREOPT_BOOT_JAR_DIR_FULL_PATH)/$(1).odex) $(eval _dbj_jar_no_dex := $(DEXPREOPT_BOOT_JAR_DIR_FULL_PATH)/$(1)_nodex.jar) -$(eval _dbj_src_jar := $(call intermediates-dir-for,JAVA_LIBRARIES,$(1),,COMMON)/javalib.dex.jar) +$(eval _dbj_src_jar := $(call intermediates-dir-for,JAVA_LIBRARIES,$(1),,COMMON)/javalib.jar) $(eval $(_dbj_odex): PRIVATE_DBJ_JAR := $(_dbj_jar)) $(_dbj_odex) : $(_dbj_src_jar) | $(ACP) $(DEXPREOPT) $(DEXOPT) @echo "Dexpreopt Boot Jar: $$@" |