From 0a68e5e66ff5cb3b22019404e984969ae6fa7f7d Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Mon, 25 Sep 2017 23:43:22 -0700 Subject: [PATCH] Fix unbundled jack builds Recent change Icbc8987468f237aa351708b33c3abe5ea3d1816e was unconditionally adding core-oj and core-libart as the bootclasspath for all jack compiles, which is incorrect and was breaking unbundled builds that don't have sources for core-oj and core-libart. Only add them when LOCAL_SDK_VERSION is not set. Test: unbundled build Change-Id: I6bab7e36e8178384f13cf9df8183a53fcb4b23f8 --- core/java_common.mk | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/core/java_common.mk b/core/java_common.mk index 476cc208e..c806fcfcf 100644 --- a/core/java_common.mk +++ b/core/java_common.mk @@ -384,12 +384,14 @@ full_static_jack_libs := \ $(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_STATIC_JACK_LIBRARIES := $(full_static_jack_libs) full_shared_jack_libs := $(call jack-lib-files,$(LOCAL_JAVA_LIBRARIES),$(LOCAL_IS_HOST_MODULE)) -ifneq ($(LOCAL_NO_STANDARD_LIBRARIES),true) - my_jack_bootclasspath := $(TARGET_DEFAULT_BOOTCLASSPATH_LIBRARIES) - ifdef LOCAL_IS_HOST_MODULE - my_jack_bootclasspath := $(addsuffix -hostdex,$(my_jack_bootclasspath)) +ifndef LOCAL_SDK_VERSION + ifneq ($(LOCAL_NO_STANDARD_LIBRARIES),true) + my_jack_bootclasspath := $(TARGET_DEFAULT_BOOTCLASSPATH_LIBRARIES) + ifdef LOCAL_IS_HOST_MODULE + my_jack_bootclasspath := $(addsuffix -hostdex,$(my_jack_bootclasspath)) + endif + full_shared_jack_libs := $(call jack-lib-files,$(my_jack_bootclasspath),$(LOCAL_IS_HOST_MODULE)) $(full_shared_jack_libs) endif - full_shared_jack_libs := $(call jack-lib-files,$(my_jack_bootclasspath),$(LOCAL_IS_HOST_MODULE)) $(full_shared_jack_libs) endif full_jack_deps := $(full_shared_jack_libs)