summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Paul Duffin <paulduffin@google.com> 2017-12-06 12:43:28 +0000
committer Paul Duffin <paulduffin@google.com> 2017-12-06 12:43:28 +0000
commit1f090a8d66126a936e40f0e872c5fe5b655fa335 (patch)
treeb66b9c914f0e1e8223717cb9eab0d9d438c5dc8a
parent7742160e39096d5f94c22992d404170931f72854 (diff)
Use prebuilt android.test.base.jar for app builds
Bug: 30188076 Test: make checkbuild Change-Id: I1d7e705baf5728e7a034f3bd32746de3a1d3cd78
-rw-r--r--test-base/Android.mk5
1 files changed, 5 insertions, 0 deletions
diff --git a/test-base/Android.mk b/test-base/Android.mk
index 6a1ac9eac3c9..03bdcf237873 100644
--- a/test-base/Android.mk
+++ b/test-base/Android.mk
@@ -60,6 +60,9 @@ LOCAL_JARJAR_RULES := $(LOCAL_PATH)/jarjar-rules.txt
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.base.stubs
# ==========================================================
include $(CLEAR_VARS)
@@ -151,6 +154,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
+
# Build the legacy-android-test library
# =====================================
# This contains the android.test classes that were in Android API level 25,