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

Commit eaa6ad6c authored by Jiyong Park's avatar Jiyong Park Committed by android-build-merger
Browse files

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

am: 0c79c5fe

Change-Id: Ic32015d2600d369ed49e2486073b2ddac7cbde38
parents a65905ad 0c79c5fe

core/binary.mk

+5 −0
Original line number Diff line number Diff line
@@ -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)

core/prebuilt_internal.mk

+2 −0
Original line number Diff line number Diff line
@@ -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