Merge "Support legacy and vndklite mode"

diff --cc contents/namespace/vndk.cc
index 593121c,026f1ca..2ffeef7
--- 1/contents/namespace/vndk.cc
--- 2/contents/namespace/vndk.cc
+++ b/contents/namespace/vndk.cc
@@@ -47,10 -48,12 +48,12 @@@ Namespace BuildVndkNamespace([[maybe_un
      ns.AddPermittedPath("/odm/${LIB}/egl", AsanPath::WITH_DATA_ASAN);
      ns.AddPermittedPath("/vendor/${LIB}/hw", AsanPath::WITH_DATA_ASAN);
      ns.AddPermittedPath("/vendor/${LIB}/egl", AsanPath::WITH_DATA_ASAN);
-     ns.AddPermittedPath("/system/vendor/${LIB}/hw", AsanPath::NONE);
+     if (!is_vndklite) {
+       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}"});