summaryrefslogtreecommitdiff
path: root/Android.mk
diff options
context:
space:
mode:
authorJiyong Park <jiyong@google.com>2018-02-12 21:57:59 +0900
committerJiyong Park <jiyong@google.com>2018-02-12 21:57:59 +0900
commitf0048397a49e482bfc362f7e42cbacff948b82bd (patch)
tree44c08bffc70923cf7e6770a7224312004c344825 /Android.mk
parent049ecedd92d91fb692ec424311318cd8b8977b0d (diff)
Fix link-type check warnings for platformprotosnano
platformprotosnano is used by cts-amwm-util and this is causing link-type check warning because cts-amwm-util is built using SDK but platformprotosnano isn't. Since platformprotosnano can actually be built with SDK APIs only, setting LOCAL_SDK_VERSION to 'current' instead of building against core-oj and core-libart which contain private APIs. LOCAL_SDK_VERSION := core_current has been tried but it didn't work because libprotobuf-java-nano is using Android APIs (thus marked as java:sdk). java:core -> java:sdk dependency is not allowed. Bug: 69899800 Test: m -j platformprotosnano Change-Id: I14a9a80bb218dae63e8320b7aab40d7ad48a7a13
Diffstat (limited to 'Android.mk')
-rw-r--r--Android.mk2
1 files changed, 1 insertions, 1 deletions
diff --git a/Android.mk b/Android.mk
index a78a01a1600f..b1c49f67b132 100644
--- a/Android.mk
+++ b/Android.mk
@@ -804,7 +804,7 @@ LOCAL_PROTOC_FLAGS := \
-Iexternal/protobuf/src
LOCAL_PROTO_JAVA_OUTPUT_PARAMS := \
store_unknown_fields = true
-LOCAL_JAVA_LIBRARIES := core-oj core-libart
+LOCAL_SDK_VERSION := current
LOCAL_SRC_FILES := \
$(call all-proto-files-under, core/proto) \
$(call all-proto-files-under, libs/incident/proto/android/os)