openkylin
/
platform_build
mirror of https://gitee.com/openkylin/platform_build.git
9
0
Fork 1
Code Issues Projects Releases Wiki Activity

Merge "Don't allow linking to a java module with broader API surface" into pi-dev

This commit is contained in:
TreeHugger Robot 2018-03-08 00:58:59 +00:00 committed by Android (Google) Code Review
parent 1fb39aa1e4 3d71a082ed
commit 355d9b8bab
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core/java_common.mk
View File

@ -457,11 +457,11 @@ ALL_MODULES.$(my_register_name).INTERMEDIATE_SOURCE_DIR := \
ifndef LOCAL_IS_HOST_MODULE ifndef LOCAL_IS_HOST_MODULE
ifeq ($(LOCAL_SDK_VERSION),system_current) ifeq ($(LOCAL_SDK_VERSION),system_current)
my_link_type := java:system my_link_type := java:system
my_warn_types := java:platform my_warn_types :=
my_allowed_types := java:sdk java:system java:core my_allowed_types := java:sdk java:system java:core
else ifneq (,$(call has-system-sdk-version,$(LOCAL_SDK_VERSION))) else ifneq (,$(call has-system-sdk-version,$(LOCAL_SDK_VERSION)))
my_link_type := java:system my_link_type := java:system
my_warn_types := java:platform my_warn_types :=
my_allowed_types := java:sdk java:system java:core my_allowed_types := java:sdk java:system java:core
else ifeq ($(LOCAL_SDK_VERSION),core_current) else ifeq ($(LOCAL_SDK_VERSION),core_current)
my_link_type := java:core my_link_type := java:core
@ -469,7 +469,7 @@ my_warn_types :=
my_allowed_types := java:core my_allowed_types := java:core
else ifneq ($(LOCAL_SDK_VERSION),) else ifneq ($(LOCAL_SDK_VERSION),)
my_link_type := java:sdk my_link_type := java:sdk
my_warn_types := java:system java:platform my_warn_types :=
my_allowed_types := java:sdk java:core my_allowed_types := java:sdk java:core
else else
my_link_type := java:platform my_link_type := java:platform