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

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

Merge "fix: linktype for recovery modules in ASAN build is native:platform"... 

Merge "fix: linktype for recovery modules in ASAN build is native:platform" am: 007f27aa am: 95dc1436
am: b0eb6f7b

Change-Id: I5f11b91a740e63d584496cbe2df0d03ef9b8326d
parents 7bc48362 b0eb6f7b

core/binary.mk

+1 −1
Original line number Diff line number Diff line
@@ -1360,7 +1360,7 @@ 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)),)

else ifneq ($(filter $(TARGET_RECOVERY_OUT)/%,$(call get_non_asan_path,$(LOCAL_MODULE_PATH))),)

my_link_type := native:recovery

my_warn_types :=

# TODO(b/113303515) remove native:platform and my_allowed_ndk_types