openkylin
/
platform_build
mirror of https://gitee.com/openkylin/platform_build.git
9
0
Fork 1
Code Issues Projects Releases Wiki Activity

am 796a2df1: am 73ca57f5: Fix host-dexed libraries. 

Merge commit '796a2df1f49f8c69b22c0a37c730b994a68cacb6'

* commit '796a2df1f49f8c69b22c0a37c730b994a68cacb6':
  Fix host-dexed libraries.
This commit is contained in:
Ying Wang 2010-09-10 18:52:51 -07:00 committed by Android Git Automerger
parent 6d76cad5fe 796a2df1f4
commit 3e642c463e
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
core/base_rules.mk
View File

@ -349,8 +349,13 @@ $(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_STATIC_JAVA_LIBRARIES := $(full_static_ja
ifdef LOCAL_IS_HOST_MODULE
# TODO: make prebuilt java libraries use the same
# intermediates path pattern as target java libraries.
ifeq ($(LOCAL_BUILD_HOST_DEX),true)
full_java_libs := $(call java-lib-files,$(LOCAL_JAVA_LIBRARIES),$(LOCAL_IS_HOST_MODULE))
full_java_lib_deps := $(call java-lib-deps,$(LOCAL_JAVA_LIBRARIES),$(LOCAL_IS_HOST_MODULE))
else
full_java_libs := $(addprefix $(HOST_OUT_JAVA_LIBRARIES)/,$(addsuffix $(COMMON_JAVA_PACKAGE_SUFFIX),$(LOCAL_JAVA_LIBRARIES)))
full_java_lib_deps := $(full_java_libs)
endif # LOCAL_BUILD_HOST_DEX
else
ifdef LOCAL_SDK_VERSION
ifneq ($(LOCAL_SDK_VERSION),current)