commit c5d2584f030ae258f058286f05ae8429e772b54c
author Jiyong Park <jiyong@google.com> Thu Mar 08 02:08:30 2018 +0000
committer android-build-merger <android-build-merger@google.com> Thu Mar 08 02:08:30 2018 +0000
tree cc7de22bc544cdbf59c4ea8965c92f5910650525
parent 6f49544bf286c0e9fbe9fc045e71eac707a79a98
parent f023aedec7400997db3f98861213c8bb2e5a5d9b

Merge "Don't allow linking to a java module with broader API surface" into pi-dev am: 355d9b8bab
am: f023aedec7

Change-Id: I1cb45b74bdddff37ac9086bab41b7ad289aeb63a

core/java_common.mk

diff --git a/core/java_common.mk b/core/java_common.mk
index b94effa..4e9d685 100644
--- a/core/java_common.mk
+++ b/core/java_common.mk
@@ -457,11 +457,11 @@
 ifndef LOCAL_IS_HOST_MODULE
 ifeq ($(LOCAL_SDK_VERSION),system_current)
 my_link_type := java:system
-my_warn_types := java:platform
+my_warn_types :=
 my_allowed_types := java:sdk java:system java:core
 else ifneq (,$(call has-system-sdk-version,$(LOCAL_SDK_VERSION)))
 my_link_type := java:system
-my_warn_types := java:platform
+my_warn_types :=
 my_allowed_types := java:sdk java:system java:core
 else ifeq ($(LOCAL_SDK_VERSION),core_current)
 my_link_type := java:core
@@ -469,7 +469,7 @@
 my_allowed_types := java:core
 else ifneq ($(LOCAL_SDK_VERSION),)
 my_link_type := java:sdk
-my_warn_types := java:system java:platform
+my_warn_types :=
 my_allowed_types := java:sdk java:core
 else
 my_link_type := java:platform