From e144602d9c94d46b2da11d70f526d747b5e05750 Mon Sep 17 00:00:00 2001
From: Paul Duffin <paulduffin@google.com>
Date: Tue, 7 Nov 2017 07:33:11 +0000
Subject: [PATCH] Use prebuilt android.test. stubs jars for app builds

Bug: 30188076
Test: tapas Launcher3
Change-Id: If632c39c9d98d89d597d410ebc7973903c9fa91e
---
 test-runner/Android.mk | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/test-runner/Android.mk b/test-runner/Android.mk
index 29a95e65dbf3d..3367aba5c0f93 100644
--- a/test-runner/Android.mk
+++ b/test-runner/Android.mk
@@ -50,6 +50,9 @@ LOCAL_MODULE:= repackaged.android.test.runner
 
 include $(BUILD_STATIC_JAVA_LIBRARY)
 
+# 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.runner.stubs
 # ============================================================
 include $(CLEAR_VARS)
@@ -149,6 +152,8 @@ update-android-test-runner-api: $(ANDROID_TEST_RUNNER_OUTPUT_API_FILE) | $(ACP)
 	@echo Copying removed.txt
 	$(hide) $(ACP) $(ANDROID_TEST_RUNNER_OUTPUT_REMOVED_API_FILE) $(ANDROID_TEST_RUNNER_REMOVED_API_FILE)
 
+endif  # not TARGET_BUILD_APPS not TARGET_BUILD_PDK=true
+
 # Build the android.test.mock library
 # ===================================
 include $(CLEAR_VARS)
@@ -161,6 +166,9 @@ LOCAL_MODULE:= android.test.mock
 
 include $(BUILD_JAVA_LIBRARY)
 
+# 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.mock.stubs
 # ==========================================================
 include $(CLEAR_VARS)
@@ -257,3 +265,5 @@ include $(BUILD_STATIC_JAVA_LIBRARY)
 
 # additionally, build unit tests in a separate .apk
 include $(call all-makefiles-under,$(LOCAL_PATH))
+
+endif  # not TARGET_BUILD_APPS not TARGET_BUILD_PDK=true