diff options
| author | Ying Wang <wangying@google.com> | 2010-10-01 17:07:29 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-01 17:07:29 -0700 |
| commit | 1406613b636da52863de9acc2b5de73fb27c602d (patch) | |
| tree | 7a34a40e21f7524e6624adb016f54b3873e9879c /core/base_rules.mk | |
| parent | 6d6511bec5eca19514740096f94d16e5f2cf4cf7 (diff) | |
| parent | bf2ed191fe229b6a83684c19a57e11e7b50c8637 (diff) | |
| download | build-1406613b636da52863de9acc2b5de73fb27c602d.zip build-1406613b636da52863de9acc2b5de73fb27c602d.tar.gz build-1406613b636da52863de9acc2b5de73fb27c602d.tar.bz2 | |
am bf2ed191: am a83940fa: Move odex related files to product-specific dir.
Merge commit 'bf2ed191fe229b6a83684c19a57e11e7b50c8637'
* commit 'bf2ed191fe229b6a83684c19a57e11e7b50c8637':
Move odex related files to product-specific dir.
Diffstat (limited to 'core/base_rules.mk')
| -rw-r--r-- | core/base_rules.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/base_rules.mk b/core/base_rules.mk index 6931069..e520228 100644 --- a/core/base_rules.mk +++ b/core/base_rules.mk @@ -342,7 +342,7 @@ ifneq ($(strip $(all_java_sources)$(all_res_assets)),) 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 |