commit 3c113098f7db6c8278f0e8114bdc187ae186d648
author Sundong Ahn <sundongahn@google.com> Thu Nov 30 16:28:22 2017 +0900
committer Colin Cross <ccross@android.com> Fri Dec 01 00:40:56 2017 +0000
tree 282deea3ba62c535e59d831ad0f2e0f41bc92b15
parent 5a44d1f069ad8cfc9afd757e662fd47ee4ed02c3

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/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