StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove unnecessary link-type check"

Browse Source 
am: 0b4b321565

Change-Id: If9c67f868a1480cf084747b41a67a4740edd735e
This commit is contained in:
Jiyong Park
2018-03-09 00:33:58 +00:00
committed by android-build-merger
parent bd3c11fd02 0b4b321565
commit 04ca4e7e9a
2 changed files with 8 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/soong_app_prebuilt.mk
View File

@@ -78,17 +78,15 @@ endif
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_allowed_types := java:sdk java:system 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_allowed_types := java:sdk java:core
else else
my_link_type := java:platform my_link_type := java:platform
my_warn_types :=
my_allowed_types := java:sdk java:system java:platform java:core
endif endif
# warn/allowed types are both empty because Soong modules can't depend on
# make-defined modules.
my_warn_types :=
my_allowed_types :=
my_link_deps := my_link_deps :=
my_2nd_arch_prefix := $(LOCAL_2ND_ARCH_VAR_PREFIX) my_2nd_arch_prefix := $(LOCAL_2ND_ARCH_VAR_PREFIX)

14
core/soong_java_prebuilt.mk
View File

@@ -116,25 +116,19 @@ javac-check-$(LOCAL_MODULE) : $(full_classes_jar)
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_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_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
my_warn_types :=
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_allowed_types := java:sdk java:core
else else
my_link_type := java:platform my_link_type := java:platform
my_warn_types :=
my_allowed_types := java:sdk java:system java:platform java:core
endif endif
# warn/allowed types are both empty because Soong modules can't depend on
# make-defined modules.
my_warn_types :=
my_allowed_types :=
my_link_deps := my_link_deps :=
my_2nd_arch_prefix := $(LOCAL_2ND_ARCH_VAR_PREFIX) my_2nd_arch_prefix := $(LOCAL_2ND_ARCH_VAR_PREFIX)