diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2018-02-15 07:40:52 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-02-15 07:40:52 +0000 |
| commit | a87160614507574b2af3fbe2c9148a7474db2397 (patch) | |
| tree | 79f0566c6ee35bb5803b6f4de7743884e52e6a37 | |
| parent | 5b0a2e38750ef0e241c8b159d0ffc1a6363e8de4 (diff) | |
| parent | fc107eec700b5154f6902979239df3aad4994fb4 (diff) | |
| download | misc-a87160614507574b2af3fbe2c9148a7474db2397.tar.gz | |
Merge "Fix link-type warnings on espresso-* prebult libs"
| -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) |