summaryrefslogtreecommitdiffstats
path: root/core/base_rules.mk
diff options
context:
space:
mode:
authorYing Wang <wangying@google.com>2014-07-07 17:15:38 -0700
committerYing Wang <wangying@google.com>2014-07-07 17:15:38 -0700
commitf25318a5f94a54309486cd8e36d4275c5f670dd3 (patch)
treed7a73c3222383989b84443ad2572ea9abb5a10aa /core/base_rules.mk
parent7b53bca0b925bc9f47b51afba14c3c8f064eae81 (diff)
downloadbuild-f25318a5f94a54309486cd8e36d4275c5f670dd3.zip
build-f25318a5f94a54309486cd8e36d4275c5f670dd3.tar.gz
build-f25318a5f94a54309486cd8e36d4275c5f670dd3.tar.bz2
Clean the last bit of LOCAL_BUILD_HOST_DEX.
Long live LOCAL_BUILD_HOST_DEX! Change-Id: I8de23cfc78edc554606a2e1a8a955e8bc3ad02b0
Diffstat (limited to 'core/base_rules.mk')
-rw-r--r--core/base_rules.mk4
1 files changed, 2 insertions, 2 deletions
diff --git a/core/base_rules.mk b/core/base_rules.mk
index 280a532..e840047 100644
--- a/core/base_rules.mk
+++ b/core/base_rules.mk
@@ -413,8 +413,8 @@ $(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_BOOTCLASSPATH :=
full_shared_java_libs := $(addprefix $(HOST_OUT_JAVA_LIBRARIES)/,\
$(addsuffix $(COMMON_JAVA_PACKAGE_SUFFIX),$(LOCAL_JAVA_LIBRARIES)))
full_java_lib_deps := $(full_shared_java_libs)
-endif # LOCAL_BUILD_HOST_DEX
-else
+endif # USE_CORE_LIB_BOOTCLASSPATH
+else # !LOCAL_IS_HOST_MODULE
full_shared_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))
endif # !LOCAL_IS_HOST_MODULE