diff options
| author | Jiyong Park <jiyong@google.com> | 2018-02-15 07:50:33 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-02-15 07:50:33 +0000 |
| commit | aab1806c32e39a07e16c6f6872b2fa3d32ac19d9 (patch) | |
| tree | 79f0566c6ee35bb5803b6f4de7743884e52e6a37 | |
| parent | 75b5654dcde5f86262c4a6d6617af122d1039a03 (diff) | |
| parent | a87160614507574b2af3fbe2c9148a7474db2397 (diff) | |
| download | misc-aab1806c32e39a07e16c6f6872b2fa3d32ac19d9.tar.gz | |
Merge "Fix link-type warnings on espresso-* prebult libs"
am: a871606145
Change-Id: Ic26d82cc5957bff397bc8c2465a10ab9036ddf93
| -rw-r--r-- | common/android-support-test/Android.mk | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/common/android-support-test/Android.mk b/common/android-support-test/Android.mk index 9b94ad55..850bb3e5 100644 --- a/common/android-support-test/Android.mk +++ b/common/android-support-test/Android.mk @@ -65,6 +65,7 @@ LOCAL_MODULE_CLASS := JAVA_LIBRARIES 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_CLASS := JAVA_LIBRARIES 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_CLASS := JAVA_LIBRARIES 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_CLASS := JAVA_LIBRARIES 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_CLASS := JAVA_LIBRARIES LOCAL_MODULE_SUFFIX := $(COMMON_JAVA_PACKAGE_SUFFIX) # Uninstallable static Java libraries. LOCAL_UNINSTALLABLE_MODULE := true +LOCAL_SDK_VERSION := 15 include $(BUILD_PREBUILT) |