From 86a0d1a8b6666a663628902237e22c820278f1ce Mon Sep 17 00:00:00 2001 From: Kiyoung Kim Date: Fri, 12 Jun 2020 19:15:05 +0900 Subject: [PATCH] Add extra search paths from unrestricted section Add extra search paths - system_ext/${LIB} and product/${LIB} - so *TS tests can be executed with extra libraries from the partners Bug: 158674810 Test: Cuttlefish boot succeeded Change-Id: I37787a92df28c3713d607eaea6a031b2b9db0f3d Merged-In: I37787a92df28c3713d607eaea6a031b2b9db0f3d --- contents/namespace/unrestricteddefault.cc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/contents/namespace/unrestricteddefault.cc b/contents/namespace/unrestricteddefault.cc index 3cfa6c3..b6186ba 100644 --- a/contents/namespace/unrestricteddefault.cc +++ b/contents/namespace/unrestricteddefault.cc @@ -30,8 +30,10 @@ Namespace BuildUnrestrictedDefaultNamespace([[maybe_unused]] const Context& ctx) Namespace ns("default", /*is_isolated=*/false, /*is_visible=*/true); ns.AddSearchPath("/system/${LIB}", AsanPath::WITH_DATA_ASAN); + ns.AddSearchPath(Var("SYSTEM_EXT") + "/${LIB}", AsanPath::WITH_DATA_ASAN); ns.AddSearchPath("/odm/${LIB}", AsanPath::WITH_DATA_ASAN); ns.AddSearchPath("/vendor/${LIB}", AsanPath::WITH_DATA_ASAN); + ns.AddSearchPath(Var("PRODUCT") + "/${LIB}", AsanPath::WITH_DATA_ASAN); ns.AddRequires(std::vector{ // Keep in sync with the "platform" namespace in art/build/apex/ld.config.txt. -- 2.11.0