From 889773f7abea722debe31413c102966e3e1bc893 Mon Sep 17 00:00:00 2001 From: Jiyong Park Date: Wed, 14 Feb 2018 21:16:15 +0900 Subject: [PATCH] BUILD_DROIDDOC supports LOCAL_NO_STANDARD_LIBRARIES When LOCAL_NO_STANDARD_LIBRARIES is set to true, droiddoc only omits framework libraries from the required libs. This enables us to use droiddoc even when frameworks/base is absent (i.e. master-art branch). Test: m -j core.current.stubs Test: build in master-art branch Change-Id: Ia9f0b8bda84b006881b3e62e6573a7784ca56a8c --- core/droiddoc.mk | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/core/droiddoc.mk b/core/droiddoc.mk index 25b591c32..81154814b 100644 --- a/core/droiddoc.mk +++ b/core/droiddoc.mk @@ -83,7 +83,11 @@ ifneq ($(LOCAL_SDK_VERSION),) _version := endif else - LOCAL_JAVA_LIBRARIES := core-oj core-libart ext framework $(LOCAL_JAVA_LIBRARIES) + ifeq ($(LOCAL_NO_STANDARD_LIBRARIES),true) + LOCAL_JAVA_LIBRARIES := core-oj core-libart + else + LOCAL_JAVA_LIBRARIES := core-oj core-libart ext framework $(LOCAL_JAVA_LIBRARIES) + endif $(full_target): PRIVATE_BOOTCLASSPATH := $(call java-lib-files, core-oj):$(call java-lib-files, core-libart) endif # LOCAL_SDK_VERSION LOCAL_JAVA_LIBRARIES := $(sort $(LOCAL_JAVA_LIBRARIES))