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

Merge "Native modules installed to recovery are marked as native:recovery"

Browse Source
This commit is contained in:
Treehugger Robot
2018-08-28 14:48:55 +00:00
committed by Gerrit Code Review
parent d7eaae0f09 5dc3475d5d
commit e3994ecedc
2 changed files with 7 additions and 0 deletions
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