Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1c00c702 authored by Ying Wang's avatar Ying Wang Committed by Android Git Automerger
Browse files

am 45322890: am d2aa51b8: Merge "Clean the last bit of LOCAL_BUILD_HOST_DEX." 

* commit '45322890':
  Clean the last bit of LOCAL_BUILD_HOST_DEX.
parents e68ec719 45322890

core/base_rules.mk

+2 −2
Original line number Diff line number Diff line
@@ -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

core/clear_vars.mk

+0 −1
Original line number Diff line number Diff line
@@ -119,7 +119,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