Merge "Don't allow linking to a java module with broader API surface" into pi-dev (355d9b8b) · Commits · e / os / android_build

core/java_common.mk

+3 −3

Original line number	Diff line number	Diff line
		@@ -457,11 +457,11 @@ ALL_MODULES.$(my_register_name).INTERMEDIATE_SOURCE_DIR := \
		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_warn_types :=
		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