From f25318a5f94a54309486cd8e36d4275c5f670dd3 Mon Sep 17 00:00:00 2001 From: Ying Wang Date: Mon, 7 Jul 2014 17:15:38 -0700 Subject: [PATCH] Clean the last bit of LOCAL_BUILD_HOST_DEX. Long live LOCAL_BUILD_HOST_DEX! Change-Id: I8de23cfc78edc554606a2e1a8a955e8bc3ad02b0 --- core/base_rules.mk | 4 ++-- core/clear_vars.mk | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/core/base_rules.mk b/core/base_rules.mk index 280a53252..e840047e4 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 diff --git a/core/clear_vars.mk b/core/clear_vars.mk index 84aaa577c..93ec226d2 100644 --- a/core/clear_vars.mk +++ b/core/clear_vars.mk @@ -118,7 +118,6 @@ LOCAL_RENDERSCRIPT_COMPATIBILITY:= LOCAL_RENDERSCRIPT_FLAGS:= LOCAL_RENDERSCRIPT_SKIP_INSTALL:= LOCAL_RENDERSCRIPT_TARGET_API:= -LOCAL_BUILD_HOST_DEX:= LOCAL_DEX_PREOPT:= # '',true,false,nostripping LOCAL_DEX_PREOPT_IMAGE_LOCATION:= LOCAL_PROTOC_OPTIMIZE_TYPE:= # lite(default),micro,nano,full