commit 0fb087fc7355a4f42ef5d403628fe5259f4d7ddd
author Michael Wright <michaelwr@google.com> Fri Nov 06 15:20:51 2015 +0000
committer Michael Wright <michaelwr@google.com> Wed Nov 25 11:38:44 2015 +0000
tree 3361b03dbbd8862bd8cbb0ed2bf8bb71fbe58960
parent 7bb7263600525c853e7e993d21fc181bd5d00dcc

Add new Test API for CTS testing.

Bug: 25608286
Change-Id: I0334061b548970959e46392dc3a1feed8533548c

core/java_common.mk

diff --git a/core/java_common.mk b/core/java_common.mk
index 0817a2b..0c2e061 100644
--- a/core/java_common.mk
+++ b/core/java_common.mk
@@ -145,9 +145,11 @@
 my_bootclasspath := $(call java-lib-files,android_stubs_current)
 else ifeq ($(LOCAL_SDK_VERSION)$(TARGET_BUILD_APPS),system_current)
 my_bootclasspath := $(call java-lib-files,android_system_stubs_current)
+else ifeq ($(LOCAL_SDK_VERSION)$(TARGET_BUILD_APPS),test_current)
+my_bootclasspath := $(call java-lib-files,android_test_stubs_current)
 else
 my_bootclasspath := $(call java-lib-files,sdk_v$(LOCAL_SDK_VERSION))
-endif # current or system_current
+endif # current, system_current, or test_current
 endif # LOCAL_SDK_VERSION
 $(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_BOOTCLASSPATH := -bootclasspath $(my_bootclasspath)
 
@@ -284,9 +286,11 @@
 my_bootclasspath := $(call jack-lib-files,android_stubs_current)
 else ifeq ($(LOCAL_SDK_VERSION)$(TARGET_BUILD_APPS),system_current)
 my_bootclasspath := $(call jack-lib-files,android_system_stubs_current)
+else ifeq ($(LOCAL_SDK_VERSION)$(TARGET_BUILD_APPS),test_current)
+my_bootclasspath := $(call jack-lib-files,android_test_stubs_current)
 else
 my_bootclasspath :=$(call jack-lib-files,sdk_v$(LOCAL_SDK_VERSION))
-endif # current or system_current
+endif # current, system_current, or test_current
 endif # LOCAL_SDK_VERSION
 $(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_BOOTCLASSPATH_JAVA_LIBRARIES := $(my_bootclasspath)