Merge "Revert "Revert "Revert "Use VNDK APEX instead of /system/lib/vndk""""
diff --git a/contents/namespace/rs.cc b/contents/namespace/rs.cc
index df6e988..e843876 100644
--- a/contents/namespace/rs.cc
+++ b/contents/namespace/rs.cc
@@ -27,8 +27,8 @@
ns.AddSearchPath("/odm/${LIB}/vndk-sp", AsanPath::WITH_DATA_ASAN);
ns.AddSearchPath("/vendor/${LIB}/vndk-sp", AsanPath::WITH_DATA_ASAN);
- ns.AddSearchPath("/apex/com.android.vndk.v@{VNDK_VER}/${LIB}",
- AsanPath::SAME_PATH);
+ ns.AddSearchPath("/system/${LIB}/vndk-sp-@{VNDK_VER}",
+ AsanPath::WITH_DATA_ASAN);
ns.AddSearchPath("/odm/${LIB}", AsanPath::WITH_DATA_ASAN);
ns.AddSearchPath("/vendor/${LIB}", AsanPath::WITH_DATA_ASAN);
diff --git a/contents/namespace/vendordefault.cc b/contents/namespace/vendordefault.cc
index efbfc03..669f30d 100644
--- a/contents/namespace/vendordefault.cc
+++ b/contents/namespace/vendordefault.cc
@@ -60,13 +60,15 @@
// 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 vndk at the last search order in vndk_lite for GSI
- ns.AddSearchPath("/apex/com.android.vndk.v@{VNDK_VER}/${LIB}",
- AsanPath::SAME_PATH);
+ // 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);
}
if (ctx.IsDefaultConfig() && GetVendorVndkVersion() == "27") {
diff --git a/contents/namespace/vndk.cc b/contents/namespace/vndk.cc
index 2ffeef7..026f1ca 100644
--- a/contents/namespace/vndk.cc
+++ b/contents/namespace/vndk.cc
@@ -33,14 +33,14 @@
ns.AddSearchPath("/odm/${LIB}/vndk-sp", AsanPath::WITH_DATA_ASAN);
ns.AddSearchPath("/vendor/${LIB}/vndk-sp", AsanPath::WITH_DATA_ASAN);
- ns.AddSearchPath("/apex/com.android.vndk.v@{VNDK_VER}/${LIB}",
- AsanPath::SAME_PATH);
+ ns.AddSearchPath("/system/${LIB}/vndk-sp-@{VNDK_VER}",
+ AsanPath::WITH_DATA_ASAN);
if (!is_system_section) {
ns.AddSearchPath("/odm/${LIB}/vndk", AsanPath::WITH_DATA_ASAN);
ns.AddSearchPath("/vendor/${LIB}/vndk", AsanPath::WITH_DATA_ASAN);
- ns.AddSearchPath("/apex/com.android.vndk.v@{VNDK_VER}/${LIB}",
- AsanPath::SAME_PATH);
+ ns.AddSearchPath("/system/${LIB}/vndk-@{VNDK_VER}",
+ AsanPath::WITH_DATA_ASAN);
}
if (is_system_section) {
@@ -52,8 +52,8 @@
ns.AddPermittedPath("/system/vendor/${LIB}/hw", AsanPath::NONE);
}
ns.AddPermittedPath("/system/vendor/${LIB}/egl", AsanPath::NONE);
- ns.AddPermittedPath("/apex/com.android.vndk.v@{VNDK_VER}/${LIB}/hw",
- AsanPath::SAME_PATH);
+ ns.AddPermittedPath("/system/${LIB}/vndk-sp-@{VNDK_VER}/hw",
+ AsanPath::WITH_DATA_ASAN);
}
ns.GetLink(ctx.GetSystemNamespaceName()).AddSharedLib({"@{LLNDK_LIBRARIES}"});