PWN-Hunter/android_build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Native modules installed to recovery are marked as native:recovery

Browse Source 
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
This commit is contained in:
Jiyong Park 2018-08-28 12:32:45 +09:00
parent c247436e2f
commit 5dc3475d5d
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
core/binary.mk
View File

@ -1450,6 +1450,11 @@ else ifdef LOCAL_USE_VNDK
my_warn_types :=
my_allowed_types := native:vendor native:vndk
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
my_link_type := native:platform
my_warn_types := $(my_warn_ndk_types)

2
core/prebuilt_internal.mk
View File

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