Merge "Remove unnecessary link-type check" am: 0b4b321565 (f8029e5f) · Commits · e / os / android_build

core/soong_app_prebuilt.mk

+4 −6

Original line number	Diff line number	Diff line
		@@ -78,17 +78,15 @@ endif
		ifndef LOCAL_IS_HOST_MODULE
		ifeq ($(LOCAL_SDK_VERSION),system_current)
		my_link_type := java:system
		my_warn_types := java:platform
		my_allowed_types := java:sdk java:system java:core
		else ifneq ($(LOCAL_SDK_VERSION),)
		my_link_type := java:sdk
		my_warn_types := java:system java:platform
		my_allowed_types := java:sdk java:core
		else
		my_link_type := java:platform
		my_warn_types :=
		my_allowed_types := java:sdk java:system java:platform java:core
		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_2nd_arch_prefix := $(LOCAL_2ND_ARCH_VAR_PREFIX)

+4 −10

Original line number	Diff line number	Diff line
		@@ -116,25 +116,19 @@ javac-check-$(LOCAL_MODULE) : $(full_classes_jar)
		ifndef LOCAL_IS_HOST_MODULE
		ifeq ($(LOCAL_SDK_VERSION),system_current)
		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)))
		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)
		my_link_type := java:core
		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_allowed_types := java:sdk java:core
		else
		my_link_type := java:platform
		my_warn_types :=
		my_allowed_types := java:sdk java:system java:platform java:core
		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_2nd_arch_prefix := $(LOCAL_2ND_ARCH_VAR_PREFIX)