commit a83940fa7851b35712e559be2246b56b5666b805
author Ying Wang <wangying@google.com> Fri Sep 24 18:09:04 2010 -0700
committer Ying Wang <wangying@google.com> Fri Oct 01 14:41:43 2010 -0700
tree 1eccf193244ca721dc484f30a2a4398a6274a14d
parent 46fc2341c535ba624fd2dceec9399ce681a80866

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

core/base_rules.mk

diff --git a/core/base_rules.mk b/core/base_rules.mk
index fbdc4ac..0505f83 100644
--- a/core/base_rules.mk
+++ b/core/base_rules.mk
@@ -342,7 +342,7 @@
 full_static_java_libs := \
     $(foreach lib,$(LOCAL_STATIC_JAVA_LIBRARIES), \
       $(call intermediates-dir-for, \
-        JAVA_LIBRARIES,$(lib),$(LOCAL_IS_HOST_MODULE))/javalib.jar)
+        JAVA_LIBRARIES,$(lib),$(LOCAL_IS_HOST_MODULE),COMMON)/javalib.jar)
 
 $(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_INSTALL_DIR := $(dir $(LOCAL_INSTALLED_MODULE))
 $(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_CLASS_INTERMEDIATES_DIR := $(intermediates)/classes