ns.AddSearchPath("/odm/${LIB}/vndk-sp", AsanPath::WITH_DATA_ASAN);
ns.AddSearchPath("/vendor/${LIB}/vndk-sp", AsanPath::WITH_DATA_ASAN);
- ns.AddSearchPath("/system/${LIB}/vndk-sp-@{VNDK_VER}",
- AsanPath::WITH_DATA_ASAN);
+ ns.AddSearchPath("/apex/com.android.vndk.v@{VNDK_VER}/${LIB}",
+ AsanPath::SAME_PATH);
ns.AddSearchPath("/odm/${LIB}", AsanPath::WITH_DATA_ASAN);
ns.AddSearchPath("/vendor/${LIB}", AsanPath::WITH_DATA_ASAN);
// VNDK-Lite devices require broader access from vendor to system/product partition
if (is_vndklite) {
- ns.AddSearchPath("/system/${LIB}/vndk-sp-@{VNDK_VER}",
- AsanPath::WITH_DATA_ASAN);
ns.AddSearchPath("/system/${LIB}", AsanPath::WITH_DATA_ASAN);
ns.AddSearchPath("/@{SYSTEM_EXT:system_ext}/${LIB}",
AsanPath::WITH_DATA_ASAN);
ns.AddSearchPath("/@{PRODUCT:product}/${LIB}", AsanPath::WITH_DATA_ASAN);
- // Put /system/lib/vndk at the last search order in vndk_lite for GSI
- ns.AddSearchPath("/system/${LIB}/vndk-@{VNDK_VER}",
- AsanPath::WITH_DATA_ASAN);
+ // Put system vndk at the last search order in vndk_lite for GSI
+ ns.AddSearchPath("/apex/com.android.vndk.v@{VNDK_VER}/${LIB}",
+ AsanPath::SAME_PATH);
}
if (ctx.IsDefaultConfig() && GetVendorVndkVersion() == "27") {
ns.AddSearchPath("/odm/${LIB}/vndk-sp", AsanPath::WITH_DATA_ASAN);
ns.AddSearchPath("/vendor/${LIB}/vndk-sp", AsanPath::WITH_DATA_ASAN);
- ns.AddSearchPath("/system/${LIB}/vndk-sp-@{VNDK_VER}",
- AsanPath::WITH_DATA_ASAN);
+ ns.AddSearchPath("/apex/com.android.vndk.v@{VNDK_VER}/${LIB}",
+ AsanPath::SAME_PATH);
if (!is_system_section) {
ns.AddSearchPath("/odm/${LIB}/vndk", AsanPath::WITH_DATA_ASAN);
ns.AddSearchPath("/vendor/${LIB}/vndk", AsanPath::WITH_DATA_ASAN);
- ns.AddSearchPath("/system/${LIB}/vndk-@{VNDK_VER}",
- AsanPath::WITH_DATA_ASAN);
+ ns.AddSearchPath("/apex/com.android.vndk.v@{VNDK_VER}/${LIB}",
+ AsanPath::SAME_PATH);
}
if (is_system_section) {
ns.AddPermittedPath("/system/vendor/${LIB}/hw", AsanPath::NONE);
}
ns.AddPermittedPath("/system/vendor/${LIB}/egl", AsanPath::NONE);
- ns.AddPermittedPath("/system/${LIB}/vndk-sp-@{VNDK_VER}/hw",
- AsanPath::WITH_DATA_ASAN);
+ ns.AddPermittedPath("/apex/com.android.vndk.v@{VNDK_VER}/${LIB}/hw",
+ AsanPath::SAME_PATH);
}
ns.GetLink(ctx.GetSystemNamespaceName()).AddSharedLib({"@{LLNDK_LIBRARIES}"});