Mark espresso prebuilts as java:sdk
The prebuilts didn't have LOCAL_SDK_VERSION, which in turn made them
categorized as java:platform which can only be referenced from other
java:platform modules. This means that an app built with
LOCAL_SDK_VERSION can't use these prebuilts. This has been working since
java:sdk -> java:platform dependency violation was only a warning, but
this will soon be an error.
In order to avoid the expected link-type check error, correctly mark the
espresso prebuilts as java:sdk by adding LOCAL_SDK_VERSION value.
Bug: 69899800
Test: mma -j under this directory
Change-Id: I783c7a560b4d60a69e759839d4ffdab266e25f9f
diff --git a/common/android-support-test/Android.mk b/common/android-support-test/Android.mk
index 9b94ad5..850bb3e 100644
--- a/common/android-support-test/Android.mk
+++ b/common/android-support-test/Android.mk
@@ -65,6 +65,7 @@
LOCAL_MODULE_SUFFIX := $(COMMON_JAVA_PACKAGE_SUFFIX)
# Uninstallable static Java libraries.
LOCAL_UNINSTALLABLE_MODULE := true
+LOCAL_SDK_VERSION := 15
include $(BUILD_PREBUILT)
# for espresso-contrib
@@ -83,6 +84,7 @@
LOCAL_MODULE_SUFFIX := $(COMMON_JAVA_PACKAGE_SUFFIX)
# Uninstallable static Java libraries.
LOCAL_UNINSTALLABLE_MODULE := true
+LOCAL_SDK_VERSION := 15
include $(BUILD_PREBUILT)
# for espresso-idling-resource
@@ -94,6 +96,7 @@
LOCAL_MODULE_SUFFIX := $(COMMON_JAVA_PACKAGE_SUFFIX)
# Uninstallable static Java libraries.
LOCAL_UNINSTALLABLE_MODULE := true
+LOCAL_SDK_VERSION := 15
include $(BUILD_PREBUILT)
# for espresso-intents
@@ -112,6 +115,7 @@
LOCAL_MODULE_SUFFIX := $(COMMON_JAVA_PACKAGE_SUFFIX)
# Uninstallable static Java libraries.
LOCAL_UNINSTALLABLE_MODULE := true
+LOCAL_SDK_VERSION := 15
include $(BUILD_PREBUILT)
# for espresso-web
@@ -130,4 +134,5 @@
LOCAL_MODULE_SUFFIX := $(COMMON_JAVA_PACKAGE_SUFFIX)
# Uninstallable static Java libraries.
LOCAL_UNINSTALLABLE_MODULE := true
+LOCAL_SDK_VERSION := 15
include $(BUILD_PREBUILT)