Use VNDK APEX instead of /system/lib/vndk

With VNDK APEX, the path to VNDK libs is changed from
/system/lib/vndk-VER to /apex/com.android.vndk.vVER/lib

Bug: 141451661
Test: m && boot (tested with cuttlefish)
Change-Id: Id92532767d8c3aa20c3aff72a9ee0602aa0be8d3

diff --git a/contents/namespace/rs.cc b/contents/namespace/rs.cc
index e843876..df6e988 100644 (file)
--- a/contents/namespace/rs.cc
+++ b/contents/namespace/rs.cc
@@ -27,8 +27,8 @@ Namespace BuildRsNamespace([[maybe_unused]] const Context& ctx) {
 
   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);
 

diff --git a/contents/namespace/vndk.cc b/contents/namespace/vndk.cc
index 65e7ef9..593121c 100644 (file)
--- a/contents/namespace/vndk.cc
+++ b/contents/namespace/vndk.cc
@@ -32,14 +32,14 @@ Namespace BuildVndkNamespace([[maybe_unused]] const Context& ctx) {
 
   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) {
@@ -49,8 +49,8 @@ Namespace BuildVndkNamespace([[maybe_unused]] const Context& ctx) {
     ns.AddPermittedPath("/vendor/${LIB}/egl", AsanPath::WITH_DATA_ASAN);
     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}"});