Merge "Use prebuilt android.test.base.jar for app builds"

This commit is contained in:
TreeHugger Robot
2017-12-07 00:40:47 +00:00
committed by Android (Google) Code Review

View File

@@ -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,