commit 007f27aa4a522ab466e0ef1478b565f99ff54e32
author Treehugger Robot <treehugger-gerrit@google.com> Wed Sep 12 23:54:48 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Sep 12 23:54:48 2018 +0000
tree 8de1a2cbef4000af8303c730a95a02ac0ce52663
parent 78f4fbeb536501851f1fb88d26b3e690edbcc931
parent a52b6e9ba85ef65b90a8673180a686ee89f2026c

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

core/binary.mk

diff --git a/core/binary.mk b/core/binary.mk
index 440c32d..a594149 100644
--- a/core/binary.mk
+++ b/core/binary.mk
@@ -1360,7 +1360,7 @@
         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