diff options
| author | Ying Wang <wangying@google.com> | 2014-07-08 00:31:00 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-07-08 00:31:00 +0000 |
| commit | f951b7743f3b5e0af933749de169b1165de14ef0 (patch) | |
| tree | 78af1f20e3fe786236dd6bc5fc10c1b601ae856c /core | |
| parent | 1a5ada11d52ffadf999c5c1f1e07c31a03d560dd (diff) | |
| parent | 1c00c7026c23967ca33524356dc11d9885f960f9 (diff) | |
| download | build-f951b7743f3b5e0af933749de169b1165de14ef0.zip build-f951b7743f3b5e0af933749de169b1165de14ef0.tar.gz build-f951b7743f3b5e0af933749de169b1165de14ef0.tar.bz2 | |
am 1c00c702: am 45322890: am d2aa51b8: Merge "Clean the last bit of LOCAL_BUILD_HOST_DEX."
* commit '1c00c7026c23967ca33524356dc11d9885f960f9':
Clean the last bit of LOCAL_BUILD_HOST_DEX.
Diffstat (limited to 'core')
| -rw-r--r-- | core/base_rules.mk | 4 | ||||
| -rw-r--r-- | 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 c2d2ca2..a4f1360 100644 --- a/core/base_rules.mk +++ b/core/base_rules.mk @@ -415,8 +415,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 dc2362d..4fd2888 100644 --- a/core/clear_vars.mk +++ b/core/clear_vars.mk @@ -120,7 +120,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 |