From 09336b56187ca494c6215f3f12b7991119e44d73 Mon Sep 17 00:00:00 2001
From: Paul Duffin <paulduffin@google.com>
Date: Wed, 6 Dec 2017 12:43:28 +0000
Subject: Use prebuilt android.test.base.jar for app builds

(cherry picked from commit 1f090a8d66126a936e40f0e872c5fe5b655fa335)

Bug: 30188076
Test: make checkbuild
Change-Id: I09a70f3e79d0935394332870613b96c653af5e85
Merged-In: I1d7e705baf5728e7a034f3bd32746de3a1d3cd78
---
 test-base/Android.mk | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'test-base')

diff --git a/test-base/Android.mk b/test-base/Android.mk
index 25c3d7646df6..861385467a0f 100644
--- a/test-base/Android.mk
+++ b/test-base/Android.mk
@@ -16,8 +16,11 @@
 
 LOCAL_PATH:= $(call my-dir)
 
-# Generate the stub source files for legacy.test.stubs
-# ====================================================
+# For unbundled build we'll use the prebuilt jar from prebuilts/sdk.
+ifeq (,$(TARGET_BUILD_APPS)$(filter true,$(TARGET_BUILD_PDK)))
+
+# Generate the stub source files for android.test.base.stubs
+# ==========================================================
 include $(CLEAR_VARS)
 
 LOCAL_SRC_FILES := \
@@ -107,6 +110,8 @@ update-android-test-base-api: $(ANDROID_TEST_BASE_OUTPUT_API_FILE) | $(ACP)
 	@echo Copying removed.txt
 	$(hide) $(ACP) $(ANDROID_TEST_BASE_OUTPUT_REMOVED_API_FILE) $(ANDROID_TEST_BASE_REMOVED_API_FILE)
 
+endif  # not TARGET_BUILD_APPS not TARGET_BUILD_PDK=true
+
 ifeq ($(HOST_OS),linux)
 # Build the legacy-performance-test-hostdex library
 # =================================================
-- 
cgit v1.2.3