commit 5cdad7a708a598d5a457596ce2726a020223dc28
author Kiyoung Kim <kiyoungkim@google.com> Thu Oct 17 06:54:04 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Oct 17 06:54:04 2019 +0000
tree ed73fc1975c6705d70f0c79a41a45adfddcd4a6b
parent f5f85e3619c5b24165a455d99a3285dac63c3025
parent e655807b1de2c76bfaed5b0f836336ec62665613

Merge "Support legacy and vndklite mode"

contents/namespace/rs.cc

diff --git a/contents/namespace/rs.cc b/contents/namespace/rs.cc
index e843876..df6e988 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("/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);
 

contents/namespace/vndk.cc

diff --git a/contents/namespace/vndk.cc b/contents/namespace/vndk.cc
index 026f1ca..2ffeef7 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("/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) {
@@ -52,8 +52,8 @@
       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}"});