diff options
| author | Jiyong Park <jiyong@google.com> | 2018-02-14 12:17:53 +0900 |
|---|---|---|
| committer | Jiyong Park <jiyong@google.com> | 2018-02-14 12:20:36 +0900 |
| commit | fc107eec700b5154f6902979239df3aad4994fb4 (patch) | |
| tree | 79f0566c6ee35bb5803b6f4de7743884e52e6a37 | |
| parent | 5b0a2e38750ef0e241c8b159d0ffc1a6363e8de4 (diff) | |
| download | misc-fc107eec700b5154f6902979239df3aad4994fb4.tar.gz | |
Fix link-type warnings on espresso-* prebult libs
The prebuilt libs are all marked with LOCAL_SDK_VERSION so that they
don't trigger link-type check warning when they are used from a library
or an app built with SDK.
For example, espresso-core is built with SDK and using
espresso-core-nodep and espresso-idling-resource-nodep, which causes
link-type check warning. This warning will soon be error.
Bug: 69899800
Test: mma -j under this directory. The build is successufl and does not
show link-type check warning other than for tagsoup (which is currently
being handled).
Change-Id: I1a9d71405ab71901d454bb2fab651353ea9ea671
| -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) |