Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5dc3475d authored Aug 28, 2018 by Jiyong Park

Native modules installed to recovery are marked as native:recovery

This fixes a bug that platform module (native:platform) can link to a
recovery module due to the fact that the recovery module is also labeled
as native:platform. Fixing the bug by setting the link type correctly to
native:recovery.

Bug: 113277544
Test: m -j

Change-Id: I88fe0a9d958f2269cf9f9ebc205b2da8c6a761a5

parent c247436e

core/binary.mk

+5 −0

Original line number	Original line	Diff line number	Diff line
	@@ -1450,6 +1450,11 @@ else ifdef LOCAL_USE_VNDK
	my_warn_types :=		my_warn_types :=
	my_allowed_types := native:vendor native:vndk		my_allowed_types := native:vendor native:vndk
	endif		endif
			else ifneq ($(filter $(TARGET_RECOVERY_OUT)/%,$(LOCAL_MODULE_PATH)),)
			my_link_type := native:recovery
			my_warn_types :=
			# TODO(b/113303515) remove native:platform and my_allowed_ndk_types
			my_allowed_types := native:recovery native:platform $(my_allowed_ndk_types)
	else		else
	my_link_type := native:platform		my_link_type := native:platform
	my_warn_types := $(my_warn_ndk_types)		my_warn_types := $(my_warn_ndk_types)

core/prebuilt_internal.mk

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -188,6 +188,8 @@ else ifdef LOCAL_USE_VNDK
	else		else
	my_link_type := native:vendor		my_link_type := native:vendor
	endif		endif
			else ifneq ($(filter $(TARGET_RECOVERY_OUT)/%,$(LOCAL_MODULE_PATH)),)
			my_link_type := native:recovery
	else		else
	my_link_type := native:platform		my_link_type := native:platform
	endif		endif