From 3c113098f7db6c8278f0e8114bdc187ae186d648 Mon Sep 17 00:00:00 2001 From: Sundong Ahn Date: Thu, 30 Nov 2017 16:28:22 +0900 Subject: [PATCH] Fix build error Fix the build error when TARGET_BUILD_APPS is set Bug: 67724799 Test: m -j TARGET_PRODUCT=full TARGET_BUILD_APPS=TVTestInput Merged-In: I981b0a245d7e8f2dabbd4e51db52d17aeacc6106 Change-Id: I981b0a245d7e8f2dabbd4e51db52d17aeacc6106 (cherry picked from commit 8e7a4c413faa5fb9e812b9b04975b313cc7db8f5) --- core/droiddoc.mk | 9 +++++++-- core/java_common.mk | 6 +++++- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/core/droiddoc.mk b/core/droiddoc.mk index 778a63151..c8d0dc81e 100644 --- a/core/droiddoc.mk +++ b/core/droiddoc.mk @@ -73,8 +73,13 @@ ifneq ($(LOCAL_SDK_VERSION),) $(full_target): PRIVATE_BOOTCLASSPATH := $(call java-lib-files, android_test_stubs_current) else ifneq (,$(call has-system-sdk-version,$(LOCAL_SDK_VERSION))) - LOCAL_JAVA_LIBRARIES := system_sdk_v$(call get-numeric-sdk-version,$(LOCAL_SDK_VERSION)) $(LOCAL_JAVA_LIBRARIES) - $(full_target): PRIVATE_BOOTCLASSPATH := $(call java-lib-files, system_sdk_v$(call get-numeric-sdk-version,$(LOCAL_SDK_VERSION))) + ifeq (,$(TARGET_BUILD_APPS)) + LOCAL_JAVA_LIBRARIES := system_sdk_v$(call get-numeric-sdk-version,$(LOCAL_SDK_VERSION)) $(LOCAL_JAVA_LIBRARIES) + $(full_target): PRIVATE_BOOTCLASSPATH := $(call java-lib-files, system_sdk_v$(call get-numeric-sdk-version,$(LOCAL_SDK_VERSION))) + else + LOCAL_JAVA_LIBRARIES := sdk_v$(LOCAL_SDK_VERSION) $(LOCAL_JAVA_LIBRARIES) + $(full_target): PRIVATE_BOOTCLASSPATH := $(call java-lib-files, sdk_v$(LOCAL_SDK_VERSION)) + endif else LOCAL_JAVA_LIBRARIES := sdk_v$(LOCAL_SDK_VERSION) $(LOCAL_JAVA_LIBRARIES) $(full_target): PRIVATE_BOOTCLASSPATH := $(call java-lib-files, sdk_v$(LOCAL_SDK_VERSION)) diff --git a/core/java_common.mk b/core/java_common.mk index 59c5e3479..a90c779b4 100644 --- a/core/java_common.mk +++ b/core/java_common.mk @@ -230,7 +230,11 @@ ifndef LOCAL_IS_HOST_MODULE full_java_bootclasspath_libs := $(call java-lib-header-files,android_test_stubs_current) else ifneq (,$(call has-system-sdk-version,$(LOCAL_SDK_VERSION))) - full_java_bootclasspath_libs := $(call java-lib-header-files,system_sdk_v$(call get-numeric-sdk-version,$(LOCAL_SDK_VERSION))) + ifeq (,$(TARGET_BUILD_APPS)) + full_java_bootclasspath_libs := $(call java-lib-header-files,system_sdk_v$(call get-numeric-sdk-version,$(LOCAL_SDK_VERSION))) + else + full_java_bootclasspath_libs := $(call java-lib-header-files,sdk_v$(LOCAL_SDK_VERSION)) + endif else full_java_bootclasspath_libs := $(call java-lib-header-files,sdk_v$(LOCAL_SDK_VERSION)) endif