commit e71a29b6c88cb576a5497a1d7c141de04c65ac32
author Sundong Ahn <sundongahn@google.com> Fri Dec 01 04:30:19 2017 +0000
committer android-build-merger <android-build-merger@google.com> Fri Dec 01 04:30:19 2017 +0000
tree 62ba2f0ec50ef805f6d3a63afc76c17a76024370
parent f4283c5ba6fdc068070bdee81b673b243db5d98f
parent 1fa4c44c3bc384e9774c9cc1eac9128ad9f01935

Merge changes from topic "system-api" am: 6e4e9f32ec
am: 1fa4c44c3b

Change-Id: I91f2547bc98b6afb73c7b7e0e9844b12a0fcc598

core/droiddoc.mk

diff --git a/core/droiddoc.mk b/core/droiddoc.mk
index 778a631..c8d0dc8 100644
--- a/core/droiddoc.mk
+++ b/core/droiddoc.mk
@@ -73,8 +73,13 @@
     $(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))

core/java_common.mk

diff --git a/core/java_common.mk b/core/java_common.mk
index 59c5e34..a90c779 100644
--- a/core/java_common.mk
+++ b/core/java_common.mk
@@ -230,7 +230,11 @@
       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