diff options
| author | Jiyong Park <jiyong@google.com> | 2018-02-15 07:56:08 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-02-15 07:56:08 +0000 |
| commit | 6de41e5569f3778d2b0d4e38c563b52462a6f33e (patch) | |
| tree | 79f0566c6ee35bb5803b6f4de7743884e52e6a37 | |
| parent | 1b0ca70ed1170b9b68b05d81fae64cfe148d9253 (diff) | |
| parent | aab1806c32e39a07e16c6f6872b2fa3d32ac19d9 (diff) | |
| download | misc-6de41e5569f3778d2b0d4e38c563b52462a6f33e.tar.gz | |
Merge "Fix link-type warnings on espresso-* prebult libs" am: a871606145
am: aab1806c32
Change-Id: I31ebf2e42643b4c8d59f9116fe0aca35bfe7a8af
| -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) |