Remove 'contributions' feature

It was to support adding extra paths to 'sphal' namespace from vendor
apexes. But it never worked as expected. Libraries from APEX should be
loaded within the APEX namespace, not anywhere else.

Bug: 309716069
Test: atest --host linkerconfig_contents_fulltest
  linkerconfig_generator_unittest linkerconfig_modules_unittest
  linkerconfig_backward_compatibility_test
Change-Id: I88d19db16ae22a59819da6960439818a6cec48a3

48 files changed, 5 insertions, 410 deletions

diff --git a/contents/namespace/sphal.cc b/contents/namespace/sphal.cc
index 291b2c9..b80ef86 100644
--- a/contents/namespace/sphal.cc
+++ b/contents/namespace/sphal.cc
@@ -51,18 +51,6 @@ Namespace BuildSphalNamespace([[maybe_unused]] const Context& ctx) {
   ns.AddPermittedPath("/vendor/odm/${LIB}");
   ns.AddPermittedPath("/system/vendor/${LIB}");
 
-  for (const auto& apex : ctx.GetApexModules()) {
-    for (const auto& contribution : apex.contributions) {
-      if (contribution.namespace_name == "sphal") {
-        for (const auto& rel_path : contribution.paths) {
-          std::string path = "/apex/" + apex.name + "/" + rel_path;
-          ns.AddSearchPath(path);
-          ns.AddPermittedPath(std::move(path));
-        }
-      }
-    }
-  }
-
   if (ctx.IsApexBinaryConfig() &&
       !android::linkerconfig::modules::IsTreblelizedDevice()) {
     // If device is legacy, let Sphal libraries access to system lib path for
diff --git a/contents/tests/configuration/apexconfig_test.cc b/contents/tests/configuration/apexconfig_test.cc
index 367e3f0..21f38df 100644
--- a/contents/tests/configuration/apexconfig_test.cc
+++ b/contents/tests/configuration/apexconfig_test.cc
@@ -47,7 +47,6 @@ struct ApexConfigTest : ::testing::Test {
                     require_libs,
                     /*jni_libs=*/{},
                     /*permitted_paths=*/{},
-                    /*contributions=*/{},
                     /*has_bin=*/true,
                     /*has_lib=*/true,
                     /*visible=*/false,
diff --git a/contents/tests/configuration/baseconfig_test.cc b/contents/tests/configuration/baseconfig_test.cc
index e4646f4..cb9e306 100644
--- a/contents/tests/configuration/baseconfig_test.cc
+++ b/contents/tests/configuration/baseconfig_test.cc
@@ -70,7 +70,7 @@ TEST(linkerconfig_configuration_fulltest,
   ctx.SetApexModules(
       {CreateTestVndkApex(),
        ApexInfo(
-           "foo", "", {}, {}, {"libjni.so"}, {}, {}, false, true, false, false)});
+           "foo", "", {}, {}, {"libjni.so"}, {}, false, true, false, false)});
   auto config = CreateBaseConfiguration(ctx);
 
   auto* section = config.GetSection("system");
@@ -101,7 +101,6 @@ TEST(linkerconfig_configuration_fulltest,
                               {":vndk", "libvendorprovide.so"},
                               {},
                               {},
-                              {},
                               false,
                               true,
                               true,
@@ -115,7 +114,6 @@ TEST(linkerconfig_configuration_fulltest,
                                {},
                                {},
                                {},
-                               {},
                                false,
                                true,
                                true,
diff --git a/modules/apex.cc b/modules/apex.cc
index 1100529..facce93 100644
--- a/modules/apex.cc
+++ b/modules/apex.cc
@@ -146,7 +146,6 @@ Result<std::map<std::string, ApexInfo>> ScanActiveApexes(const std::string& root
 
     std::vector<std::string> permitted_paths;
     bool visible = false;
-    std::vector<Contribution> contributions;
 
     std::string linker_config_path = path + "/etc/linker.config.pb";
     if (PathExists(linker_config_path)) {
@@ -164,12 +163,6 @@ Result<std::map<std::string, ApexInfo>> ScanActiveApexes(const std::string& root
           }
         }
         visible = linker_config->visible();
-        for (auto& contribution : linker_config->contributions()) {
-          Contribution c;
-          c.namespace_name = contribution.namespace_();
-          c.paths = {contribution.paths().begin(), contribution.paths().end()};
-          contributions.emplace_back(std::move(c));
-        }
       } else {
         return Error() << "Failed to read APEX linker config : "
                        << linker_config.error();
@@ -184,7 +177,6 @@ Result<std::map<std::string, ApexInfo>> ScanActiveApexes(const std::string& root
                    manifest.requirenativelibs().end()},
                   {manifest.jnilibs().begin(), manifest.jnilibs().end()},
                   std::move(permitted_paths),
-                  std::move(contributions),
                   has_bin,
                   has_lib,
                   visible,
diff --git a/modules/include/linkerconfig/apex.h b/modules/include/linkerconfig/apex.h
index 823ff1c..a857dba 100644
--- a/modules/include/linkerconfig/apex.h
+++ b/modules/include/linkerconfig/apex.h
@@ -25,12 +25,6 @@
 namespace android {
 namespace linkerconfig {
 namespace modules {
-
-struct Contribution {
-  std::string namespace_name;
-  std::vector<std::string> paths;
-};
-
 struct ApexInfo {
   std::string name;
   std::string namespace_name;
@@ -41,7 +35,6 @@ struct ApexInfo {
   std::vector<std::string> jni_libs;
   std::vector<std::string> permitted_paths;
   std::vector<std::string> public_libs;
-  std::vector<Contribution> contributions;
   bool has_bin;
   bool has_lib;
   bool visible;
@@ -52,8 +45,7 @@ struct ApexInfo {
            std::vector<std::string> provide_libs,
            std::vector<std::string> require_libs,
            std::vector<std::string> jni_libs,
-           std::vector<std::string> permitted_paths,
-           std::vector<Contribution> contributions, bool has_bin, bool has_lib,
+           std::vector<std::string> permitted_paths, bool has_bin, bool has_lib,
            bool visible, bool has_shared_lib)
       : name(std::move(name)),
         path(std::move(path)),
@@ -61,7 +53,6 @@ struct ApexInfo {
         require_libs(std::move(require_libs)),
         jni_libs(std::move(jni_libs)),
         permitted_paths(std::move(permitted_paths)),
-        contributions(std::move(contributions)),
         has_bin(has_bin),
         has_lib(has_lib),
         visible(visible),
diff --git a/modules/tests/apex_test.cc b/modules/tests/apex_test.cc
index f6502d4..79358af 100644
--- a/modules/tests/apex_test.cc
+++ b/modules/tests/apex_test.cc
@@ -50,7 +50,6 @@ TEST(apex_namespace, build_namespace) {
                               /*require_libs=*/{},
                               /*jni_libs=*/{},
                               /*permitted_paths=*/{},
-                              /*contributions=*/{},
                               /*has_bin=*/false,
                               /*has_lib=*/true,
                               /*visible=*/false,
@@ -91,7 +90,6 @@ TEST(apex_namespace, resolve_between_apex_namespaces) {
                               /*require_libs=*/{"bar.so"},
                               /*jni_libs=*/{},
                               /*permitted_paths=*/{},
-                              /*contributions=*/{},
                               /*has_bin=*/false,
                               /*has_lib=*/true,
                               /*visible=*/false,
@@ -103,7 +101,6 @@ TEST(apex_namespace, resolve_between_apex_namespaces) {
                               /*require_libs=*/{},
                               /*jni_libs=*/{},
                               /*permitted_paths=*/{},
-                              /*contributions=*/{},
                               /*has_bin=*/false,
                               /*has_lib=*/true,
                               /*visible=*/false,
@@ -130,7 +127,6 @@ TEST(apex_namespace, extra_permitted_paths) {
                               /*require_libs=*/{},
                               /*jni_libs=*/{},
                               /*permitted_paths=*/{"/a", "/b/c"},
-                              /*contributions=*/{},
                               /*has_bin=*/false,
                               /*has_lib=*/true,
                               /*visible=*/false,
diff --git a/modules/tests/section_test.cc b/modules/tests/section_test.cc
index 56f0151..cf0469a 100644
--- a/modules/tests/section_test.cc
+++ b/modules/tests/section_test.cc
@@ -247,11 +247,10 @@ TEST(linkerconfig_section, ignore_unmet_requirements) {
 TEST(linkerconfig_section, resolve_section_with_apex) {
   BaseContext ctx;
   ctx.SetApexModules(
-      {ApexInfo(
-           "foo", "", {"a.so"}, {"b.so"}, {}, {}, {}, true, true, false, false),
-       ApexInfo("bar", "", {"b.so"}, {}, {}, {}, {}, true, true, false, false),
+      {ApexInfo("foo", "", {"a.so"}, {"b.so"}, {}, {}, true, true, false, false),
+       ApexInfo("bar", "", {"b.so"}, {}, {}, {}, true, true, false, false),
        ApexInfo(
-           "baz", "", {"c.so"}, {"a.so"}, {}, {}, {}, true, true, false, false)});
+           "baz", "", {"c.so"}, {"a.so"}, {}, {}, true, true, false, false)});
   std::vector<Namespace> namespaces;
   Namespace& default_ns = namespaces.emplace_back("default");
   default_ns.AddRequires(std::vector{"a.so", "b.so"});
diff --git a/testdata/golden_output/deprecate_product_vndk/com.android.adbd/ld.config.txt b/testdata/golden_output/deprecate_product_vndk/com.android.adbd/ld.config.txt
index afdceb6..0cb10ea 100644
--- a/testdata/golden_output/deprecate_product_vndk/com.android.adbd/ld.config.txt
+++ b/testdata/golden_output/deprecate_product_vndk/com.android.adbd/ld.config.txt
@@ -195,12 +195,10 @@ namespace.sphal.search.paths = /odm/${LIB}
 namespace.sphal.search.paths += /vendor/${LIB}
 namespace.sphal.search.paths += /vendor/${LIB}/egl
 namespace.sphal.search.paths += /vendor/${LIB}/hw
-namespace.sphal.search.paths += /apex/com.vendor.service2/${LIB}/egl
 namespace.sphal.permitted.paths = /odm/${LIB}
 namespace.sphal.permitted.paths += /vendor/${LIB}
 namespace.sphal.permitted.paths += /vendor/odm/${LIB}
 namespace.sphal.permitted.paths += /system/vendor/${LIB}
-namespace.sphal.permitted.paths += /apex/com.vendor.service2/${LIB}/egl
 namespace.sphal.asan.search.paths = /data/asan/odm/${LIB}
 namespace.sphal.asan.search.paths += /odm/${LIB}
 namespace.sphal.asan.search.paths += /data/asan/vendor/${LIB}
@@ -209,7 +207,6 @@ namespace.sphal.asan.search.paths += /data/asan/vendor/${LIB}/egl
 namespace.sphal.asan.search.paths += /vendor/${LIB}/egl
 namespace.sphal.asan.search.paths += /data/asan/vendor/${LIB}/hw
 namespace.sphal.asan.search.paths += /vendor/${LIB}/hw
-namespace.sphal.asan.search.paths += /apex/com.vendor.service2/${LIB}/egl
 namespace.sphal.asan.permitted.paths = /data/asan/odm/${LIB}
 namespace.sphal.asan.permitted.paths += /odm/${LIB}
 namespace.sphal.asan.permitted.paths += /data/asan/vendor/${LIB}
@@ -218,7 +215,6 @@ namespace.sphal.asan.permitted.paths += /data/asan/vendor/odm/${LIB}
 namespace.sphal.asan.permitted.paths += /vendor/odm/${LIB}
 namespace.sphal.asan.permitted.paths += /data/asan/system/vendor/${LIB}
 namespace.sphal.asan.permitted.paths += /system/vendor/${LIB}
-namespace.sphal.asan.permitted.paths += /apex/com.vendor.service2/${LIB}/egl
 namespace.sphal.hwasan.search.paths = /odm/${LIB}/hwasan
 namespace.sphal.hwasan.search.paths += /odm/${LIB}
 namespace.sphal.hwasan.search.paths += /vendor/${LIB}/hwasan
@@ -227,8 +223,6 @@ namespace.sphal.hwasan.search.paths += /vendor/${LIB}/egl/hwasan
 namespace.sphal.hwasan.search.paths += /vendor/${LIB}/egl
 namespace.sphal.hwasan.search.paths += /vendor/${LIB}/hw/hwasan
 namespace.sphal.hwasan.search.paths += /vendor/${LIB}/hw
-namespace.sphal.hwasan.search.paths += /apex/com.vendor.service2/${LIB}/egl/hwasan
-namespace.sphal.hwasan.search.paths += /apex/com.vendor.service2/${LIB}/egl
 namespace.sphal.hwasan.permitted.paths = /odm/${LIB}/hwasan
 namespace.sphal.hwasan.permitted.paths += /odm/${LIB}
 namespace.sphal.hwasan.permitted.paths += /vendor/${LIB}/hwasan
@@ -237,8 +231,6 @@ namespace.sphal.hwasan.permitted.paths += /vendor/odm/${LIB}/hwasan
 namespace.sphal.hwasan.permitted.paths += /vendor/odm/${LIB}
 namespace.sphal.hwasan.permitted.paths += /system/vendor/${LIB}/hwasan
 namespace.sphal.hwasan.permitted.paths += /system/vendor/${LIB}
-namespace.sphal.hwasan.permitted.paths += /apex/com.vendor.service2/${LIB}/egl/hwasan
-namespace.sphal.hwasan.permitted.paths += /apex/com.vendor.service2/${LIB}/egl
 namespace.sphal.links = system,vndk,com_android_neuralnetworks
 namespace.sphal.link.system.shared_libs = libEGL.so:libGLESv1_CM.so:libGLESv2.so:libGLESv3.so:libRS.so:libandroid_net.so:libbinder_ndk.so:libc.so:libcgrouprc.so:libclang_rt.asan-i686-android.so:libdl.so:liblog.so:libm.so:libmediandk.so:libnativewindow.so:libsync.so:libvndksupport.so:libvulkan.so:libdl_android.so:libclang_rt.asan-arm-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so
 namespace.sphal.link.vndk.shared_libs = android.hardware.graphics.common@1.0.so:android.hardware.graphics.common@1.1.so:android.hardware.graphics.common@1.2.so:android.hardware.graphics.mapper@2.0.so:android.hardware.graphics.mapper@2.1.so:android.hardware.graphics.mapper@3.0.so:android.hardware.renderscript@1.0.so:android.hidl.memory.token@1.0.so:android.hidl.memory@1.0-impl.so:android.hidl.memory@1.0.so:android.hidl.safe_union@1.0.so:libRSCpuRef.so:libRSDriver.so:libRS_internal.so:libbase.so:libbcinfo.so:libc++.so:libcutils.so:libhardware.so:libhidlbase.so:libhidlmemory.so:libion.so:libjsoncpp.so:liblzma.so:libprocessgroup.so:libunwindstack.so:libutils.so:libutilscallstack.so:libz.so
diff --git a/testdata/golden_output/deprecate_product_vndk/com.android.art/ld.config.txt b/testdata/golden_output/deprecate_product_vndk/com.android.art/ld.config.txt
index 22c5b51..f77f942 100644
--- a/testdata/golden_output/deprecate_product_vndk/com.android.art/ld.config.txt
+++ b/testdata/golden_output/deprecate_product_vndk/com.android.art/ld.config.txt
@@ -229,12 +229,10 @@ namespace.sphal.search.paths = /odm/${LIB}
 namespace.sphal.search.paths += /vendor/${LIB}
 namespace.sphal.search.paths += /vendor/${LIB}/egl
 namespace.sphal.search.paths += /vendor/${LIB}/hw
-namespace.sphal.search.paths += /apex/com.vendor.service2/${LIB}/egl
 namespace.sphal.permitted.paths = /odm/${LIB}
 namespace.sphal.permitted.paths += /vendor/${LIB}
 namespace.sphal.permitted.paths += /vendor/odm/${LIB}
 namespace.sphal.permitted.paths += /system/vendor/${LIB}
-namespace.sphal.permitted.paths += /apex/com.vendor.service2/${LIB}/egl
 namespace.sphal.asan.search.paths = /data/asan/odm/${LIB}
 namespace.sphal.asan.search.paths += /odm/${LIB}
 namespace.sphal.asan.search.paths += /data/asan/vendor/${LIB}
@@ -243,7 +241,6 @@ namespace.sphal.asan.search.paths += /data/asan/vendor/${LIB}/egl
 namespace.sphal.asan.search.paths += /vendor/${LIB}/egl
 namespace.sphal.asan.search.paths += /data/asan/vendor/${LIB}/hw
 namespace.sphal.asan.search.paths += /vendor/${LIB}/hw
-namespace.sphal.asan.search.paths += /apex/com.vendor.service2/${LIB}/egl
 namespace.sphal.asan.permitted.paths = /data/asan/odm/${LIB}
 namespace.sphal.asan.permitted.paths += /odm/${LIB}
 namespace.sphal.asan.permitted.paths += /data/asan/vendor/${LIB}
@@ -252,7 +249,6 @@ namespace.sphal.asan.permitted.paths += /data/asan/vendor/odm/${LIB}
 namespace.sphal.asan.permitted.paths += /vendor/odm/${LIB}
 namespace.sphal.asan.permitted.paths += /data/asan/system/vendor/${LIB}
 namespace.sphal.asan.permitted.paths += /system/vendor/${LIB}
-namespace.sphal.asan.permitted.paths += /apex/com.vendor.service2/${LIB}/egl
 namespace.sphal.hwasan.search.paths = /odm/${LIB}/hwasan
 namespace.sphal.hwasan.search.paths += /odm/${LIB}
 namespace.sphal.hwasan.search.paths += /vendor/${LIB}/hwasan
@@ -261,8 +257,6 @@ namespace.sphal.hwasan.search.paths += /vendor/${LIB}/egl/hwasan
 namespace.sphal.hwasan.search.paths += /vendor/${LIB}/egl
 namespace.sphal.hwasan.search.paths += /vendor/${LIB}/hw/hwasan
 namespace.sphal.hwasan.search.paths += /vendor/${LIB}/hw
-namespace.sphal.hwasan.search.paths += /apex/com.vendor.service2/${LIB}/egl/hwasan
-namespace.sphal.hwasan.search.paths += /apex/com.vendor.service2/${LIB}/egl
 namespace.sphal.hwasan.permitted.paths = /odm/${LIB}/hwasan
 namespace.sphal.hwasan.permitted.paths += /odm/${LIB}
 namespace.sphal.hwasan.permitted.paths += /vendor/${LIB}/hwasan
@@ -271,8 +265,6 @@ namespace.sphal.hwasan.permitted.paths += /vendor/odm/${LIB}/hwasan
 namespace.sphal.hwasan.permitted.paths += /vendor/odm/${LIB}
 namespace.sphal.hwasan.permitted.paths += /system/vendor/${LIB}/hwasan
 namespace.sphal.hwasan.permitted.paths += /system/vendor/${LIB}
-namespace.sphal.hwasan.permitted.paths += /apex/com.vendor.service2/${LIB}/egl/hwasan
-namespace.sphal.hwasan.permitted.paths += /apex/com.vendor.service2/${LIB}/egl
 namespace.sphal.links = system,vndk,com_android_neuralnetworks
 namespace.sphal.link.system.shared_libs = libEGL.so:libGLESv1_CM.so:libGLESv2.so:libGLESv3.so:libRS.so:libandroid_net.so:libbinder_ndk.so:libc.so:libcgrouprc.so:libclang_rt.asan-i686-android.so:libdl.so:liblog.so:libm.so:libmediandk.so:libnativewindow.so:libsync.so:libvndksupport.so:libvulkan.so:libdl_android.so:libclang_rt.asan-arm-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so
 namespace.sphal.link.vndk.shared_libs = android.hardware.graphics.common@1.0.so:android.hardware.graphics.common@1.1.so:android.hardware.graphics.common@1.2.so:android.hardware.graphics.mapper@2.0.so:android.hardware.graphics.mapper@2.1.so:android.hardware.graphics.mapper@3.0.so:android.hardware.renderscript@1.0.so:android.hidl.memory.token@1.0.so:android.hidl.memory@1.0-impl.so:android.hidl.memory@1.0.so:android.hidl.safe_union@1.0.so:libRSCpuRef.so:libRSDriver.so:libRS_internal.so:libbase.so:libbcinfo.so:libc++.so:libcutils.so:libhardware.so:libhidlbase.so:libhidlmemory.so:libion.so:libjsoncpp.so:liblzma.so:libprocessgroup.so:libunwindstack.so:libutils.so:libutilscallstack.so:libz.so
diff --git a/testdata/golden_output/deprecate_product_vndk/com.android.conscrypt/ld.config.txt b/testdata/golden_output/deprecate_product_vndk/com.android.conscrypt/ld.config.txt
index d2c1917..1dcea6e 100644
--- a/testdata/golden_output/deprecate_product_vndk/com.android.conscrypt/ld.config.txt
+++ b/testdata/golden_output/deprecate_product_vndk/com.android.conscrypt/ld.config.txt
@@ -217,12 +217,10 @@ namespace.sphal.search.paths = /odm/${LIB}
 namespace.sphal.search.paths += /vendor/${LIB}
 namespace.sphal.search.paths += /vendor/${LIB}/egl
 namespace.sphal.search.paths += /vendor/${LIB}/hw
-namespace.sphal.search.paths += /apex/com.vendor.service2/${LIB}/egl
 namespace.sphal.permitted.paths = /odm/${LIB}
 namespace.sphal.permitted.paths += /vendor/${LIB}
 namespace.sphal.permitted.paths += /vendor/odm/${LIB}
 namespace.sphal.permitted.paths += /system/vendor/${LIB}
-namespace.sphal.permitted.paths += /apex/com.vendor.service2/${LIB}/egl
 namespace.sphal.asan.search.paths = /data/asan/odm/${LIB}
 namespace.sphal.asan.search.paths += /odm/${LIB}
 namespace.sphal.asan.search.paths += /data/asan/vendor/${LIB}
@@ -231,7 +229,6 @@ namespace.sphal.asan.search.paths += /data/asan/vendor/${LIB}/egl
 namespace.sphal.asan.search.paths += /vendor/${LIB}/egl
 namespace.sphal.asan.search.paths += /data/asan/vendor/${LIB}/hw
 namespace.sphal.asan.search.paths += /vendor/${LIB}/hw
-namespace.sphal.asan.search.paths += /apex/com.vendor.service2/${LIB}/egl
 namespace.sphal.asan.permitted.paths = /data/asan/odm/${LIB}
 namespace.sphal.asan.permitted.paths += /odm/${LIB}
 namespace.sphal.asan.permitted.paths += /data/asan/vendor/${LIB}
@@ -240,7 +237,6 @@ namespace.sphal.asan.permitted.paths += /data/asan/vendor/odm/${LIB}
 namespace.sphal.asan.permitted.paths += /vendor/odm/${LIB}
 namespace.sphal.asan.permitted.paths += /data/asan/system/vendor/${LIB}
 namespace.sphal.asan.permitted.paths += /system/vendor/${LIB}
-namespace.sphal.asan.permitted.paths += /apex/com.vendor.service2/${LIB}/egl
 namespace.sphal.hwasan.search.paths = /odm/${LIB}/hwasan
 namespace.sphal.hwasan.search.paths += /odm/${LIB}
 namespace.sphal.hwasan.search.paths += /vendor/${LIB}/hwasan
@@ -249,8 +245,6 @@ namespace.sphal.hwasan.search.paths += /vendor/${LIB}/egl/hwasan
 namespace.sphal.hwasan.search.paths += /vendor/${LIB}/egl
 namespace.sphal.hwasan.search.paths += /vendor/${LIB}/hw/hwasan
 namespace.sphal.hwasan.search.paths += /vendor/${LIB}/hw
-namespace.sphal.hwasan.search.paths += /apex/com.vendor.service2/${LIB}/egl/hwasan
-namespace.sphal.hwasan.search.paths += /apex/com.vendor.service2/${LIB}/egl
 namespace.sphal.hwasan.permitted.paths = /odm/${LIB}/hwasan
 namespace.sphal.hwasan.permitted.paths += /odm/${LIB}
 namespace.sphal.hwasan.permitted.paths += /vendor/${LIB}/hwasan
@@ -259,8 +253,6 @@ namespace.sphal.hwasan.permitted.paths += /vendor/odm/${LIB}/hwasan
 namespace.sphal.hwasan.permitted.paths += /vendor/odm/${LIB}
 namespace.sphal.hwasan.permitted.paths += /system/vendor/${LIB}/hwasan
 namespace.sphal.hwasan.permitted.paths += /system/vendor/${LIB}
-namespace.sphal.hwasan.permitted.paths += /apex/com.vendor.service2/${LIB}/egl/hwasan
-namespace.sphal.hwasan.permitted.paths += /apex/com.vendor.service2/${LIB}/egl
 namespace.sphal.links = system,vndk,com_android_neuralnetworks
 namespace.sphal.link.system.shared_libs = libEGL.so:libGLESv1_CM.so:libGLESv2.so:libGLESv3.so:libRS.so:libandroid_net.so:libbinder_ndk.so:libc.so:libcgrouprc.so:libclang_rt.asan-i686-android.so:libdl.so:liblog.so:libm.so:libmediandk.so:libnativewindow.so:libsync.so:libvndksupport.so:libvulkan.so:libdl_android.so:libclang_rt.asan-arm-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so
 namespace.sphal.link.vndk.shared_libs = android.hardware.graphics.common@1.0.so:android.hardware.graphics.common@1.1.so:android.hardware.graphics.common@1.2.so:android.hardware.graphics.mapper@2.0.so:android.hardware.graphics.mapper@2.1.so:android.hardware.graphics.mapper@3.0.so:android.hardware.renderscript@1.0.so:android.hidl.memory.token@1.0.so:android.hidl.memory@1.0-impl.so:android.hidl.memory@1.0.so:android.hidl.safe_union@1.0.so:libRSCpuRef.so:libRSDriver.so:libRS_internal.so:libbase.so:libbcinfo.so:libc++.so:libcutils.so:libhardware.so:libhidlbase.so:libhidlmemory.so:libion.so:libjsoncpp.so:liblzma.so:libprocessgroup.so:libunwindstack.so:libutils.so:libutilscallstack.so:libz.so
diff --git a/testdata/golden_output/deprecate_product_vndk/com.android.media.swcodec/ld.config.txt b/testdata/golden_output/deprecate_product_vndk/com.android.media.swcodec/ld.config.txt
index 72fd31f..ad917a9 100644
--- a/testdata/golden_output/deprecate_product_vndk/com.android.media.swcodec/ld.config.txt
+++ b/testdata/golden_output/deprecate_product_vndk/com.android.media.swcodec/ld.config.txt
@@ -216,12 +216,10 @@ namespace.sphal.search.paths = /odm/${LIB}
 namespace.sphal.search.paths += /vendor/${LIB}
 namespace.sphal.search.paths += /vendor/${LIB}/egl
 namespace.sphal.search.paths += /vendor/${LIB}/hw
-namespace.sphal.search.paths += /apex/com.vendor.service2/${LIB}/egl
 namespace.sphal.permitted.paths = /odm/${LIB}
 namespace.sphal.permitted.paths += /vendor/${LIB}
 namespace.sphal.permitted.paths += /vendor/odm/${LIB}
 namespace.sphal.permitted.paths += /system/vendor/${LIB}
-namespace.sphal.permitted.paths += /apex/com.vendor.service2/${LIB}/egl
 namespace.sphal.asan.search.paths = /data/asan/odm/${LIB}
 namespace.sphal.asan.search.paths += /odm/${LIB}
 namespace.sphal.asan.search.paths += /data/asan/vendor/${LIB}
@@ -230,7 +228,6 @@ namespace.sphal.asan.search.paths += /data/asan/vendor/${LIB}/egl
 namespace.sphal.asan.search.paths += /vendor/${LIB}/egl
 namespace.sphal.asan.search.paths += /data/asan/vendor/${LIB}/hw
 namespace.sphal.asan.search.paths += /vendor/${LIB}/hw
-namespace.sphal.asan.search.paths += /apex/com.vendor.service2/${LIB}/egl
 namespace.sphal.asan.permitted.paths = /data/asan/odm/${LIB}
 namespace.sphal.asan.permitted.paths += /odm/${LIB}
 namespace.sphal.asan.permitted.paths += /data/asan/vendor/${LIB}
@@ -239,7 +236,6 @@ namespace.sphal.asan.permitted.paths += /data/asan/vendor/odm/${LIB}
 namespace.sphal.asan.permitted.paths += /vendor/odm/${LIB}
 namespace.sphal.asan.permitted.paths += /data/asan/system/vendor/${LIB}
 namespace.sphal.asan.permitted.paths += /system/vendor/${LIB}
-namespace.sphal.asan.permitted.paths += /apex/com.vendor.service2/${LIB}/egl
 namespace.sphal.hwasan.search.paths = /odm/${LIB}/hwasan
 namespace.sphal.hwasan.search.paths += /odm/${LIB}
 namespace.sphal.hwasan.search.paths += /vendor/${LIB}/hwasan
@@ -248,8 +244,6 @@ namespace.sphal.hwasan.search.paths += /vendor/${LIB}/egl/hwasan
 namespace.sphal.hwasan.search.paths += /vendor/${LIB}/egl
 namespace.sphal.hwasan.search.paths += /vendor/${LIB}/hw/hwasan
 namespace.sphal.hwasan.search.paths += /vendor/${LIB}/hw
-namespace.sphal.hwasan.search.paths += /apex/com.vendor.service2/${LIB}/egl/hwasan
-namespace.sphal.hwasan.search.paths += /apex/com.vendor.service2/${LIB}/egl
 namespace.sphal.hwasan.permitted.paths = /odm/${LIB}/hwasan
 namespace.sphal.hwasan.permitted.paths += /odm/${LIB}
 namespace.sphal.hwasan.permitted.paths += /vendor/${LIB}/hwasan
@@ -258,8 +252,6 @@ namespace.sphal.hwasan.permitted.paths += /vendor/odm/${LIB}/hwasan
 namespace.sphal.hwasan.permitted.paths += /vendor/odm/${LIB}
 namespace.sphal.hwasan.permitted.paths += /system/vendor/${LIB}/hwasan
 namespace.sphal.hwasan.permitted.paths += /system/vendor/${LIB}
-namespace.sphal.hwasan.permitted.paths += /apex/com.vendor.service2/${LIB}/egl/hwasan
-namespace.sphal.hwasan.permitted.paths += /apex/com.vendor.service2/${LIB}/egl
 namespace.sphal.links = system,vndk,com_android_neuralnetworks
 namespace.sphal.link.system.shared_libs = libEGL.so:libGLESv1_CM.so:libGLESv2.so:libGLESv3.so:libRS.so:libandroid_net.so:libbinder_ndk.so:libc.so:libcgrouprc.so:libclang_rt.asan-i686-android.so:libdl.so:liblog.so:libm.so:libmediandk.so:libnativewindow.so:libsync.so:libvndksupport.so:libvulkan.so:libdl_android.so:libclang_rt.asan-arm-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so
 namespace.sphal.link.vndk.shared_libs = android.hardware.graphics.common@1.0.so:android.hardware.graphics.common@1.1.so:android.hardware.graphics.common@1.2.so:android.hardware.graphics.mapper@2.0.so:android.hardware.graphics.mapper@2.1.so:android.hardware.graphics.mapper@3.0.so:android.hardware.renderscript@1.0.so:android.hidl.memory.token@1.0.so:android.hidl.memory@1.0-impl.so:android.hidl.memory@1.0.so:android.hidl.safe_union@1.0.so:libRSCpuRef.so:libRSDriver.so:libRS_internal.so:libbase.so:libbcinfo.so:libc++.so:libcutils.so:libhardware.so:libhidlbase.so:libhidlmemory.so:libion.so:libjsoncpp.so:liblzma.so:libprocessgroup.so:libunwindstack.so:libutils.so:libutilscallstack.so:libz.so
diff --git a/testdata/golden_output/deprecate_product_vndk/com.android.runtime/ld.config.txt b/testdata/golden_output/deprecate_product_vndk/com.android.runtime/ld.config.txt
index b7ccf80..c5a9dd0 100644
--- a/testdata/golden_output/deprecate_product_vndk/com.android.runtime/ld.config.txt
+++ b/testdata/golden_output/deprecate_product_vndk/com.android.runtime/ld.config.txt
@@ -199,12 +199,10 @@ namespace.sphal.search.paths = /odm/${LIB}
 namespace.sphal.search.paths += /vendor/${LIB}
 namespace.sphal.search.paths += /vendor/${LIB}/egl
 namespace.sphal.search.paths += /vendor/${LIB}/hw
-namespace.sphal.search.paths += /apex/com.vendor.service2/${LIB}/egl
 namespace.sphal.permitted.paths = /odm/${LIB}
 namespace.sphal.permitted.paths += /vendor/${LIB}
 namespace.sphal.permitted.paths += /vendor/odm/${LIB}
 namespace.sphal.permitted.paths += /system/vendor/${LIB}
-namespace.sphal.permitted.paths += /apex/com.vendor.service2/${LIB}/egl
 namespace.sphal.asan.search.paths = /data/asan/odm/${LIB}
 namespace.sphal.asan.search.paths += /odm/${LIB}
 namespace.sphal.asan.search.paths += /data/asan/vendor/${LIB}
@@ -213,7 +211,6 @@ namespace.sphal.asan.search.paths += /data/asan/vendor/${LIB}/egl
 namespace.sphal.asan.search.paths += /vendor/${LIB}/egl
 namespace.sphal.asan.search.paths += /data/asan/vendor/${LIB}/hw
 namespace.sphal.asan.search.paths += /vendor/${LIB}/hw
-namespace.sphal.asan.search.paths += /apex/com.vendor.service2/${LIB}/egl
 namespace.sphal.asan.permitted.paths = /data/asan/odm/${LIB}
 namespace.sphal.asan.permitted.paths += /odm/${LIB}
 namespace.sphal.asan.permitted.paths += /data/asan/vendor/${LIB}
@@ -222,7 +219,6 @@ namespace.sphal.asan.permitted.paths += /data/asan/vendor/odm/${LIB}
 namespace.sphal.asan.permitted.paths += /vendor/odm/${LIB}
 namespace.sphal.asan.permitted.paths += /data/asan/system/vendor/${LIB}
 namespace.sphal.asan.permitted.paths += /system/vendor/${LIB}
-namespace.sphal.asan.permitted.paths += /apex/com.vendor.service2/${LIB}/egl
 namespace.sphal.hwasan.search.paths = /odm/${LIB}/hwasan
 namespace.sphal.hwasan.search.paths += /odm/${LIB}
 namespace.sphal.hwasan.search.paths += /vendor/${LIB}/hwasan
@@ -231,8 +227,6 @@ namespace.sphal.hwasan.search.paths += /vendor/${LIB}/egl/hwasan
 namespace.sphal.hwasan.search.paths += /vendor/${LIB}/egl
 namespace.sphal.hwasan.search.paths += /vendor/${LIB}/hw/hwasan
 namespace.sphal.hwasan.search.paths += /vendor/${LIB}/hw
-namespace.sphal.hwasan.search.paths += /apex/com.vendor.service2/${LIB}/egl/hwasan
-namespace.sphal.hwasan.search.paths += /apex/com.vendor.service2/${LIB}/egl
 namespace.sphal.hwasan.permitted.paths = /odm/${LIB}/hwasan
 namespace.sphal.hwasan.permitted.paths += /odm/${LIB}
 namespace.sphal.hwasan.permitted.paths += /vendor/${LIB}/hwasan
@@ -241,8 +235,6 @@ namespace.sphal.hwasan.permitted.paths += /vendor/odm/${LIB}/hwasan
 namespace.sphal.hwasan.permitted.paths += /vendor/odm/${LIB}
 namespace.sphal.hwasan.permitted.paths += /system/vendor/${LIB}/hwasan
 namespace.sphal.hwasan.permitted.paths += /system/vendor/${LIB}
-namespace.sphal.hwasan.permitted.paths += /apex/com.vendor.service2/${LIB}/egl/hwasan
-namespace.sphal.hwasan.permitted.paths += /apex/com.vendor.service2/${LIB}/egl
 namespace.sphal.links = system,vndk,com_android_neuralnetworks
 namespace.sphal.link.system.shared_libs = libEGL.so:libGLESv1_CM.so:libGLESv2.so:libGLESv3.so:libRS.so:libandroid_net.so:libbinder_ndk.so:libc.so:libcgrouprc.so:libclang_rt.asan-i686-android.so:libdl.so:liblog.so:libm.so:libmediandk.so:libnativewindow.so:libsync.so:libvndksupport.so:libvulkan.so:libdl_android.so:libclang_rt.asan-arm-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so
 namespace.sphal.link.vndk.shared_libs = android.hardware.graphics.common@1.0.so:android.hardware.graphics.common@1.1.so:android.hardware.graphics.common@1.2.so:android.hardware.graphics.mapper@2.0.so:android.hardware.graphics.mapper@2.1.so:android.hardware.graphics.mapper@3.0.so:android.hardware.renderscript@1.0.so:android.hidl.memory.token@1.0.so:android.hidl.memory@1.0-impl.so:android.hidl.memory@1.0.so:android.hidl.safe_union@1.0.so:libRSCpuRef.so:libRSDriver.so:libRS_internal.so:libbase.so:libbcinfo.so:libc++.so:libcutils.so:libhardware.so:libhidlbase.so:libhidlmemory.so:libion.so:libjsoncpp.so:liblzma.so:libprocessgroup.so:libunwindstack.so:libutils.so:libutilscallstack.so:libz.so
diff --git a/testdata/golden_output/deprecate_product_vndk/com.android.sdkext/ld.config.txt b/testdata/golden_output/deprecate_product_vndk/com.android.sdkext/ld.config.txt
index 40264a0..73612ca 100644
--- a/testdata/golden_output/deprecate_product_vndk/com.android.sdkext/ld.config.txt
+++ b/testdata/golden_output/deprecate_product_vndk/com.android.sdkext/ld.config.txt
@@ -216,12 +216,10 @@ namespace.sphal.search.paths = /odm/${LIB}
 namespace.sphal.search.paths += /vendor/${LIB}
 namespace.sphal.search.paths += /vendor/${LIB}/egl
 namespace.sphal.search.paths += /vendor/${LIB}/hw
-namespace.sphal.search.paths += /apex/com.vendor.service2/${LIB}/egl
 namespace.sphal.permitted.paths = /odm/${LIB}
 namespace.sphal.permitted.paths += /vendor/${LIB}
 namespace.sphal.permitted.paths += /vendor/odm/${LIB}
 namespace.sphal.permitted.paths += /system/vendor/${LIB}
-namespace.sphal.permitted.paths += /apex/com.vendor.service2/${LIB}/egl
 namespace.sphal.asan.search.paths = /data/asan/odm/${LIB}
 namespace.sphal.asan.search.paths += /odm/${LIB}
 namespace.sphal.asan.search.paths += /data/asan/vendor/${LIB}
@@ -230,7 +228,6 @@ namespace.sphal.asan.search.paths += /data/asan/vendor/${LIB}/egl
 namespace.sphal.asan.search.paths += /vendor/${LIB}/egl
 namespace.sphal.asan.search.paths += /data/asan/vendor/${LIB}/hw
 namespace.sphal.asan.search.paths += /vendor/${LIB}/hw
-namespace.sphal.asan.search.paths += /apex/com.vendor.service2/${LIB}/egl
 namespace.sphal.asan.permitted.paths = /data/asan/odm/${LIB}
 namespace.sphal.asan.permitted.paths += /odm/${LIB}
 namespace.sphal.asan.permitted.paths += /data/asan/vendor/${LIB}
@@ -239,7 +236,6 @@ namespace.sphal.asan.permitted.paths += /data/asan/vendor/odm/${LIB}
 namespace.sphal.asan.permitted.paths += /vendor/odm/${LIB}
 namespace.sphal.asan.permitted.paths += /data/asan/system/vendor/${LIB}
 namespace.sphal.asan.permitted.paths += /system/vendor/${LIB}
-namespace.sphal.asan.permitted.paths += /apex/com.vendor.service2/${LIB}/egl
 namespace.sphal.hwasan.search.paths = /odm/${LIB}/hwasan
 namespace.sphal.hwasan.search.paths += /odm/${LIB}
 namespace.sphal.hwasan.search.paths += /vendor/${LIB}/hwasan
@@ -248,8 +244,6 @@ namespace.sphal.hwasan.search.paths += /vendor/${LIB}/egl/hwasan
 namespace.sphal.hwasan.search.paths += /vendor/${LIB}/egl
 namespace.sphal.hwasan.search.paths += /vendor/${LIB}/hw/hwasan
 namespace.sphal.hwasan.search.paths += /vendor/${LIB}/hw
-namespace.sphal.hwasan.search.paths += /apex/com.vendor.service2/${LIB}/egl/hwasan
-namespace.sphal.hwasan.search.paths += /apex/com.vendor.service2/${LIB}/egl
 namespace.sphal.hwasan.permitted.paths = /odm/${LIB}/hwasan
 namespace.sphal.hwasan.permitted.paths += /odm/${LIB}
 namespace.sphal.hwasan.permitted.paths += /vendor/${LIB}/hwasan
@@ -258,8 +252,6 @@ namespace.sphal.hwasan.permitted.paths += /vendor/odm/${LIB}/hwasan
 namespace.sphal.hwasan.permitted.paths += /vendor/odm/${LIB}
 namespace.sphal.hwasan.permitted.paths += /system/vendor/${LIB}/hwasan
 namespace.sphal.hwasan.permitted.paths += /system/vendor/${LIB}
-namespace.sphal.hwasan.permitted.paths += /apex/com.vendor.service2/${LIB}/egl/hwasan
-namespace.sphal.hwasan.permitted.paths += /apex/com.vendor.service2/${LIB}/egl
 namespace.sphal.links = system,vndk,com_android_neuralnetworks
 namespace.sphal.link.system.shared_libs = libEGL.so:libGLESv1_CM.so:libGLESv2.so:libGLESv3.so:libRS.so:libandroid_net.so:libbinder_ndk.so:libc.so:libcgrouprc.so:libclang_rt.asan-i686-android.so:libdl.so:liblog.so:libm.so:libmediandk.so:libnativewindow.so:libsync.so:libvndksupport.so:libvulkan.so:libdl_android.so:libclang_rt.asan-arm-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so
 namespace.sphal.link.vndk.shared_libs = android.hardware.graphics.common@1.0.so:android.hardware.graphics.common@1.1.so:android.hardware.graphics.common@1.2.so:android.hardware.graphics.mapper@2.0.so:android.hardware.graphics.mapper@2.1.so:android.hardware.graphics.mapper@3.0.so:android.hardware.renderscript@1.0.so:android.hidl.memory.token@1.0.so:android.hidl.memory@1.0-impl.so:android.hidl.memory@1.0.so:android.hidl.safe_union@1.0.so:libRSCpuRef.so:libRSDriver.so:libRS_internal.so:libbase.so:libbcinfo.so:libc++.so:libcutils.so:libhardware.so:libhidlbase.so:libhidlmemory.so:libion.so:libjsoncpp.so:liblzma.so:libprocessgroup.so:libunwindstack.so:libutils.so:libutilscallstack.so:libz.so
diff --git a/testdata/golden_output/deprecate_product_vndk/com.product.service1/ld.config.txt b/testdata/golden_output/deprecate_product_vndk/com.product.service1/ld.config.txt
index d08cd7f..a67ffd1 100644
--- a/testdata/golden_output/deprecate_product_vndk/com.product.service1/ld.config.txt
+++ b/testdata/golden_output/deprecate_product_vndk/com.product.service1/ld.config.txt
@@ -232,12 +232,10 @@ namespace.sphal.search.paths = /odm/${LIB}
 namespace.sphal.search.paths += /vendor/${LIB}
 namespace.sphal.search.paths += /vendor/${LIB}/egl
 namespace.sphal.search.paths += /vendor/${LIB}/hw
-namespace.sphal.search.paths += /apex/com.vendor.service2/${LIB}/egl
 namespace.sphal.permitted.paths = /odm/${LIB}
 namespace.sphal.permitted.paths += /vendor/${LIB}
 namespace.sphal.permitted.paths += /vendor/odm/${LIB}
 namespace.sphal.permitted.paths += /system/vendor/${LIB}
-namespace.sphal.permitted.paths += /apex/com.vendor.service2/${LIB}/egl
 namespace.sphal.asan.search.paths = /data/asan/odm/${LIB}
 namespace.sphal.asan.search.paths += /odm/${LIB}
 namespace.sphal.asan.search.paths += /data/asan/vendor/${LIB}
@@ -246,7 +244,6 @@ namespace.sphal.asan.search.paths += /data/asan/vendor/${LIB}/egl
 namespace.sphal.asan.search.paths += /vendor/${LIB}/egl
 namespace.sphal.asan.search.paths += /data/asan/vendor/${LIB}/hw
 namespace.sphal.asan.search.paths += /vendor/${LIB}/hw
-namespace.sphal.asan.search.paths += /apex/com.vendor.service2/${LIB}/egl
 namespace.sphal.asan.permitted.paths = /data/asan/odm/${LIB}
 namespace.sphal.asan.permitted.paths += /odm/${LIB}
 namespace.sphal.asan.permitted.paths += /data/asan/vendor/${LIB}
@@ -255,7 +252,6 @@ namespace.sphal.asan.permitted.paths += /data/asan/vendor/odm/${LIB}
 namespace.sphal.asan.permitted.paths += /vendor/odm/${LIB}
 namespace.sphal.asan.permitted.paths += /data/asan/system/vendor/${LIB}
 namespace.sphal.asan.permitted.paths += /system/vendor/${LIB}
-namespace.sphal.asan.permitted.paths += /apex/com.vendor.service2/${LIB}/egl
 namespace.sphal.hwasan.search.paths = /odm/${LIB}/hwasan
 namespace.sphal.hwasan.search.paths += /odm/${LIB}
 namespace.sphal.hwasan.search.paths += /vendor/${LIB}/hwasan
@@ -264,8 +260,6 @@ namespace.sphal.hwasan.search.paths += /vendor/${LIB}/egl/hwasan
 namespace.sphal.hwasan.search.paths += /vendor/${LIB}/egl
 namespace.sphal.hwasan.search.paths += /vendor/${LIB}/hw/hwasan
 namespace.sphal.hwasan.search.paths += /vendor/${LIB}/hw
-namespace.sphal.hwasan.search.paths += /apex/com.vendor.service2/${LIB}/egl/hwasan
-namespace.sphal.hwasan.search.paths += /apex/com.vendor.service2/${LIB}/egl
 namespace.sphal.hwasan.permitted.paths = /odm/${LIB}/hwasan
 namespace.sphal.hwasan.permitted.paths += /odm/${LIB}
 namespace.sphal.hwasan.permitted.paths += /vendor/${LIB}/hwasan
@@ -274,8 +268,6 @@ namespace.sphal.hwasan.permitted.paths += /vendor/odm/${LIB}/hwasan
 namespace.sphal.hwasan.permitted.paths += /vendor/odm/${LIB}
 namespace.sphal.hwasan.permitted.paths += /system/vendor/${LIB}/hwasan
 namespace.sphal.hwasan.permitted.paths += /system/vendor/${LIB}
-namespace.sphal.hwasan.permitted.paths += /apex/com.vendor.service2/${LIB}/egl/hwasan
-namespace.sphal.hwasan.permitted.paths += /apex/com.vendor.service2/${LIB}/egl
 namespace.sphal.links = system,com_android_neuralnetworks
 namespace.sphal.link.system.shared_libs = libEGL.so:libGLESv1_CM.so:libGLESv2.so:libGLESv3.so:libRS.so:libandroid_net.so:libbinder_ndk.so:libc.so:libcgrouprc.so:libclang_rt.asan-i686-android.so:libdl.so:liblog.so:libm.so:libmediandk.so:libnativewindow.so:libsync.so:libvndksupport.so:libvulkan.so:libdl_android.so:libclang_rt.asan-arm-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so
 namespace.sphal.link.com_android_neuralnetworks.shared_libs = libneuralnetworks.so
diff --git a/testdata/golden_output/deprecate_product_vndk/ld.config.txt b/testdata/golden_output/deprecate_product_vndk/ld.config.txt
index 05a20bc..004c06d 100644
--- a/testdata/golden_output/deprecate_product_vndk/ld.config.txt
+++ b/testdata/golden_output/deprecate_product_vndk/ld.config.txt
@@ -484,12 +484,10 @@ namespace.sphal.search.paths = /odm/${LIB}
 namespace.sphal.search.paths += /vendor/${LIB}
 namespace.sphal.search.paths += /vendor/${LIB}/egl
 namespace.sphal.search.paths += /vendor/${LIB}/hw
-namespace.sphal.search.paths += /apex/com.vendor.service2/${LIB}/egl
 namespace.sphal.permitted.paths = /odm/${LIB}
 namespace.sphal.permitted.paths += /vendor/${LIB}
 namespace.sphal.permitted.paths += /vendor/odm/${LIB}
 namespace.sphal.permitted.paths += /system/vendor/${LIB}
-namespace.sphal.permitted.paths += /apex/com.vendor.service2/${LIB}/egl
 namespace.sphal.asan.search.paths = /data/asan/odm/${LIB}
 namespace.sphal.asan.search.paths += /odm/${LIB}
 namespace.sphal.asan.search.paths += /data/asan/vendor/${LIB}
@@ -498,7 +496,6 @@ namespace.sphal.asan.search.paths += /data/asan/vendor/${LIB}/egl
 namespace.sphal.asan.search.paths += /vendor/${LIB}/egl
 namespace.sphal.asan.search.paths += /data/asan/vendor/${LIB}/hw
 namespace.sphal.asan.search.paths += /vendor/${LIB}/hw
-namespace.sphal.asan.search.paths += /apex/com.vendor.service2/${LIB}/egl
 namespace.sphal.asan.permitted.paths = /data/asan/odm/${LIB}
 namespace.sphal.asan.permitted.paths += /odm/${LIB}
 namespace.sphal.asan.permitted.paths += /data/asan/vendor/${LIB}
@@ -507,7 +504,6 @@ namespace.sphal.asan.permitted.paths += /data/asan/vendor/odm/${LIB}
 namespace.sphal.asan.permitted.paths += /vendor/odm/${LIB}
 namespace.sphal.asan.permitted.paths += /data/asan/system/vendor/${LIB}
 namespace.sphal.asan.permitted.paths += /system/vendor/${LIB}
-namespace.sphal.asan.permitted.paths += /apex/com.vendor.service2/${LIB}/egl
 namespace.sphal.hwasan.search.paths = /odm/${LIB}/hwasan
 namespace.sphal.hwasan.search.paths += /odm/${LIB}
 namespace.sphal.hwasan.search.paths += /vendor/${LIB}/hwasan
@@ -516,8 +512,6 @@ namespace.sphal.hwasan.search.paths += /vendor/${LIB}/egl/hwasan
 namespace.sphal.hwasan.search.paths += /vendor/${LIB}/egl
 namespace.sphal.hwasan.search.paths += /vendor/${LIB}/hw/hwasan
 namespace.sphal.hwasan.search.paths += /vendor/${LIB}/hw
-namespace.sphal.hwasan.search.paths += /apex/com.vendor.service2/${LIB}/egl/hwasan
-namespace.sphal.hwasan.search.paths += /apex/com.vendor.service2/${LIB}/egl
 namespace.sphal.hwasan.permitted.paths = /odm/${LIB}/hwasan
 namespace.sphal.hwasan.permitted.paths += /odm/${LIB}
 namespace.sphal.hwasan.permitted.paths += /vendor/${LIB}/hwasan
@@ -526,8 +520,6 @@ namespace.sphal.hwasan.permitted.paths += /vendor/odm/${LIB}/hwasan
 namespace.sphal.hwasan.permitted.paths += /vendor/odm/${LIB}
 namespace.sphal.hwasan.permitted.paths += /system/vendor/${LIB}/hwasan
 namespace.sphal.hwasan.permitted.paths += /system/vendor/${LIB}
-namespace.sphal.hwasan.permitted.paths += /apex/com.vendor.service2/${LIB}/egl/hwasan
-namespace.sphal.hwasan.permitted.paths += /apex/com.vendor.service2/${LIB}/egl
 namespace.sphal.links = default,rs,vndk,com_android_neuralnetworks
 namespace.sphal.link.default.shared_libs = libEGL.so:libGLESv1_CM.so:libGLESv2.so:libGLESv3.so:libRS.so:libandroid_net.so:libbinder_ndk.so:libc.so:libcgrouprc.so:libclang_rt.asan-i686-android.so:libdl.so:liblog.so:libm.so:libmediandk.so:libnativewindow.so:libsync.so:libvndksupport.so:libvulkan.so:libdl_android.so:libclang_rt.asan-arm-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so
 namespace.sphal.link.rs.shared_libs = libRS_internal.so
@@ -1813,12 +1805,10 @@ namespace.sphal.search.paths = /odm/${LIB}
 namespace.sphal.search.paths += /vendor/${LIB}
 namespace.sphal.search.paths += /vendor/${LIB}/egl
 namespace.sphal.search.paths += /vendor/${LIB}/hw
-namespace.sphal.search.paths += /apex/com.vendor.service2/${LIB}/egl
 namespace.sphal.permitted.paths = /odm/${LIB}
 namespace.sphal.permitted.paths += /vendor/${LIB}
 namespace.sphal.permitted.paths += /vendor/odm/${LIB}
 namespace.sphal.permitted.paths += /system/vendor/${LIB}
-namespace.sphal.permitted.paths += /apex/com.vendor.service2/${LIB}/egl
 namespace.sphal.asan.search.paths = /data/asan/odm/${LIB}
 namespace.sphal.asan.search.paths += /odm/${LIB}
 namespace.sphal.asan.search.paths += /data/asan/vendor/${LIB}
@@ -1827,7 +1817,6 @@ namespace.sphal.asan.search.paths += /data/asan/vendor/${LIB}/egl
 namespace.sphal.asan.search.paths += /vendor/${LIB}/egl
 namespace.sphal.asan.search.paths += /data/asan/vendor/${LIB}/hw
 namespace.sphal.asan.search.paths += /vendor/${LIB}/hw
-namespace.sphal.asan.search.paths += /apex/com.vendor.service2/${LIB}/egl
 namespace.sphal.asan.permitted.paths = /data/asan/odm/${LIB}
 namespace.sphal.asan.permitted.paths += /odm/${LIB}
 namespace.sphal.asan.permitted.paths += /data/asan/vendor/${LIB}
@@ -1836,7 +1825,6 @@ namespace.sphal.asan.permitted.paths += /data/asan/vendor/odm/${LIB}
 namespace.sphal.asan.permitted.paths += /vendor/odm/${LIB}
 namespace.sphal.asan.permitted.paths += /data/asan/system/vendor/${LIB}
 namespace.sphal.asan.permitted.paths += /system/vendor/${LIB}
-namespace.sphal.asan.permitted.paths += /apex/com.vendor.service2/${LIB}/egl
 namespace.sphal.hwasan.search.paths = /odm/${LIB}/hwasan
 namespace.sphal.hwasan.search.paths += /odm/${LIB}
 namespace.sphal.hwasan.search.paths += /vendor/${LIB}/hwasan
@@ -1845,8 +1833,6 @@ namespace.sphal.hwasan.search.paths += /vendor/${LIB}/egl/hwasan
 namespace.sphal.hwasan.search.paths += /vendor/${LIB}/egl
 namespace.sphal.hwasan.search.paths += /vendor/${LIB}/hw/hwasan
 namespace.sphal.hwasan.search.paths += /vendor/${LIB}/hw
-namespace.sphal.hwasan.search.paths += /apex/com.vendor.service2/${LIB}/egl/hwasan
-namespace.sphal.hwasan.search.paths += /apex/com.vendor.service2/${LIB}/egl
 namespace.sphal.hwasan.permitted.paths = /odm/${LIB}/hwasan
 namespace.sphal.hwasan.permitted.paths += /odm/${LIB}
 namespace.sphal.hwasan.permitted.paths += /vendor/${LIB}/hwasan
@@ -1855,8 +1841,6 @@ namespace.sphal.hwasan.permitted.paths += /vendor/odm/${LIB}/hwasan
 namespace.sphal.hwasan.permitted.paths += /vendor/odm/${LIB}
 namespace.sphal.hwasan.permitted.paths += /system/vendor/${LIB}/hwasan
 namespace.sphal.hwasan.permitted.paths += /system/vendor/${LIB}
-namespace.sphal.hwasan.permitted.paths += /apex/com.vendor.service2/${LIB}/egl/hwasan
-namespace.sphal.hwasan.permitted.paths += /apex/com.vendor.service2/${LIB}/egl
 namespace.sphal.links = default,rs,vndk,com_android_neuralnetworks
 namespace.sphal.link.default.shared_libs = libEGL.so:libGLESv1_CM.so:libGLESv2.so:libGLESv3.so:libRS.so:libandroid_net.so:libbinder_ndk.so:libc.so:libcgrouprc.so:libclang_rt.asan-i686-android.so:libdl.so:liblog.so:libm.so:libmediandk.so:libnativewindow.so:libsync.so:libvndksupport.so:libvulkan.so:libdl_android.so:libclang_rt.asan-arm-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so
 namespace.sphal.link.rs.shared_libs = libRS_internal.so
diff --git a/testdata/golden_output/deprecate_vndk/com.android.adbd/ld.config.txt b/testdata/golden_output/deprecate_vndk/com.android.adbd/ld.config.txt
index 8d38893..f91e77a 100644
--- a/testdata/golden_output/deprecate_vndk/com.android.adbd/ld.config.txt
+++ b/testdata/golden_output/deprecate_vndk/com.android.adbd/ld.config.txt
@@ -195,12 +195,10 @@ namespace.sphal.search.paths = /odm/${LIB}
 namespace.sphal.search.paths += /vendor/${LIB}
 namespace.sphal.search.paths += /vendor/${LIB}/egl
 namespace.sphal.search.paths += /vendor/${LIB}/hw
-namespace.sphal.search.paths += /apex/com.vendor.service2/${LIB}/egl
 namespace.sphal.permitted.paths = /odm/${LIB}
 namespace.sphal.permitted.paths += /vendor/${LIB}
 namespace.sphal.permitted.paths += /vendor/odm/${LIB}
 namespace.sphal.permitted.paths += /system/vendor/${LIB}
-namespace.sphal.permitted.paths += /apex/com.vendor.service2/${LIB}/egl
 namespace.sphal.asan.search.paths = /data/asan/odm/${LIB}
 namespace.sphal.asan.search.paths += /odm/${LIB}
 namespace.sphal.asan.search.paths += /data/asan/vendor/${LIB}
@@ -209,7 +207,6 @@ namespace.sphal.asan.search.paths += /data/asan/vendor/${LIB}/egl
 namespace.sphal.asan.search.paths += /vendor/${LIB}/egl
 namespace.sphal.asan.search.paths += /data/asan/vendor/${LIB}/hw
 namespace.sphal.asan.search.paths += /vendor/${LIB}/hw
-namespace.sphal.asan.search.paths += /apex/com.vendor.service2/${LIB}/egl
 namespace.sphal.asan.permitted.paths = /data/asan/odm/${LIB}
 namespace.sphal.asan.permitted.paths += /odm/${LIB}
 namespace.sphal.asan.permitted.paths += /data/asan/vendor/${LIB}
@@ -218,7 +215,6 @@ namespace.sphal.asan.permitted.paths += /data/asan/vendor/odm/${LIB}
 namespace.sphal.asan.permitted.paths += /vendor/odm/${LIB}
 namespace.sphal.asan.permitted.paths += /data/asan/system/vendor/${LIB}
 namespace.sphal.asan.permitted.paths += /system/vendor/${LIB}
-namespace.sphal.asan.permitted.paths += /apex/com.vendor.service2/${LIB}/egl
 namespace.sphal.hwasan.search.paths = /odm/${LIB}/hwasan
 namespace.sphal.hwasan.search.paths += /odm/${LIB}
 namespace.sphal.hwasan.search.paths += /vendor/${LIB}/hwasan
@@ -227,8 +223,6 @@ namespace.sphal.hwasan.search.paths += /vendor/${LIB}/egl/hwasan
 namespace.sphal.hwasan.search.paths += /vendor/${LIB}/egl
 namespace.sphal.hwasan.search.paths += /vendor/${LIB}/hw/hwasan
 namespace.sphal.hwasan.search.paths += /vendor/${LIB}/hw
-namespace.sphal.hwasan.search.paths += /apex/com.vendor.service2/${LIB}/egl/hwasan
-namespace.sphal.hwasan.search.paths += /apex/com.vendor.service2/${LIB}/egl
 namespace.sphal.hwasan.permitted.paths = /odm/${LIB}/hwasan
 namespace.sphal.hwasan.permitted.paths += /odm/${LIB}
 namespace.sphal.hwasan.permitted.paths += /vendor/${LIB}/hwasan
@@ -237,8 +231,6 @@ namespace.sphal.hwasan.permitted.paths += /vendor/odm/${LIB}/hwasan
 namespace.sphal.hwasan.permitted.paths += /vendor/odm/${LIB}
 namespace.sphal.hwasan.permitted.paths += /system/vendor/${LIB}/hwasan
 namespace.sphal.hwasan.permitted.paths += /system/vendor/${LIB}
-namespace.sphal.hwasan.permitted.paths += /apex/com.vendor.service2/${LIB}/egl/hwasan
-namespace.sphal.hwasan.permitted.paths += /apex/com.vendor.service2/${LIB}/egl
 namespace.sphal.links = system,com_android_neuralnetworks
 namespace.sphal.link.system.shared_libs = libEGL.so:libGLESv1_CM.so:libGLESv2.so:libGLESv3.so:libRS.so:libandroid_net.so:libbinder_ndk.so:libc.so:libcgrouprc.so:libclang_rt.asan-i686-android.so:libdl.so:libft2.so:liblog.so:libm.so:libmediandk.so:libnativewindow.so:libsync.so:libvndksupport.so:libvulkan.so:libdl_android.so:libclang_rt.asan-arm-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so
 namespace.sphal.link.com_android_neuralnetworks.shared_libs = libneuralnetworks.so
diff --git a/testdata/golden_output/deprecate_vndk/com.android.art/ld.config.txt b/testdata/golden_output/deprecate_vndk/com.android.art/ld.config.txt
index 8749546..3453e51 100644
--- a/testdata/golden_output/deprecate_vndk/com.android.art/ld.config.txt
+++ b/testdata/golden_output/deprecate_vndk/com.android.art/ld.config.txt
@@ -229,12 +229,10 @@ namespace.sphal.search.paths = /odm/${LIB}
 namespace.sphal.search.paths += /vendor/${LIB}
 namespace.sphal.search.paths += /vendor/${LIB}/egl
 namespace.sphal.search.paths += /vendor/${LIB}/hw
-namespace.sphal.search.paths += /apex/com.vendor.service2/${LIB}/egl
 namespace.sphal.permitted.paths = /odm/${LIB}
 namespace.sphal.permitted.paths += /vendor/${LIB}
 namespace.sphal.permitted.paths += /vendor/odm/${LIB}
 namespace.sphal.permitted.paths += /system/vendor/${LIB}
-namespace.sphal.permitted.paths += /apex/com.vendor.service2/${LIB}/egl
 namespace.sphal.asan.search.paths = /data/asan/odm/${LIB}
 namespace.sphal.asan.search.paths += /odm/${LIB}
 namespace.sphal.asan.search.paths += /data/asan/vendor/${LIB}
@@ -243,7 +241,6 @@ namespace.sphal.asan.search.paths += /data/asan/vendor/${LIB}/egl
 namespace.sphal.asan.search.paths += /vendor/${LIB}/egl
 namespace.sphal.asan.search.paths += /data/asan/vendor/${LIB}/hw
 namespace.sphal.asan.search.paths += /vendor/${LIB}/hw
-namespace.sphal.asan.search.paths += /apex/com.vendor.service2/${LIB}/egl
 namespace.sphal.asan.permitted.paths = /data/asan/odm/${LIB}
 namespace.sphal.asan.permitted.paths += /odm/${LIB}
 namespace.sphal.asan.permitted.paths += /data/asan/vendor/${LIB}
@@ -252,7 +249,6 @@ namespace.sphal.asan.permitted.paths += /data/asan/vendor/odm/${LIB}
 namespace.sphal.asan.permitted.paths += /vendor/odm/${LIB}
 namespace.sphal.asan.permitted.paths += /data/asan/system/vendor/${LIB}
 namespace.sphal.asan.permitted.paths += /system/vendor/${LIB}
-namespace.sphal.asan.permitted.paths += /apex/com.vendor.service2/${LIB}/egl
 namespace.sphal.hwasan.search.paths = /odm/${LIB}/hwasan
 namespace.sphal.hwasan.search.paths += /odm/${LIB}
 namespace.sphal.hwasan.search.paths += /vendor/${LIB}/hwasan
@@ -261,8 +257,6 @@ namespace.sphal.hwasan.search.paths += /vendor/${LIB}/egl/hwasan
 namespace.sphal.hwasan.search.paths += /vendor/${LIB}/egl
 namespace.sphal.hwasan.search.paths += /vendor/${LIB}/hw/hwasan
 namespace.sphal.hwasan.search.paths += /vendor/${LIB}/hw
-namespace.sphal.hwasan.search.paths += /apex/com.vendor.service2/${LIB}/egl/hwasan
-namespace.sphal.hwasan.search.paths += /apex/com.vendor.service2/${LIB}/egl
 namespace.sphal.hwasan.permitted.paths = /odm/${LIB}/hwasan
 namespace.sphal.hwasan.permitted.paths += /odm/${LIB}
 namespace.sphal.hwasan.permitted.paths += /vendor/${LIB}/hwasan
@@ -271,8 +265,6 @@ namespace.sphal.hwasan.permitted.paths += /vendor/odm/${LIB}/hwasan
 namespace.sphal.hwasan.permitted.paths += /vendor/odm/${LIB}
 namespace.sphal.hwasan.permitted.paths += /system/vendor/${LIB}/hwasan
 namespace.sphal.hwasan.permitted.paths += /system/vendor/${LIB}
-namespace.sphal.hwasan.permitted.paths += /apex/com.vendor.service2/${LIB}/egl/hwasan
-namespace.sphal.hwasan.permitted.paths += /apex/com.vendor.service2/${LIB}/egl
 namespace.sphal.links = system,com_android_neuralnetworks
 namespace.sphal.link.system.shared_libs = libEGL.so:libGLESv1_CM.so:libGLESv2.so:libGLESv3.so:libRS.so:libandroid_net.so:libbinder_ndk.so:libc.so:libcgrouprc.so:libclang_rt.asan-i686-android.so:libdl.so:libft2.so:liblog.so:libm.so:libmediandk.so:libnativewindow.so:libsync.so:libvndksupport.so:libvulkan.so:libdl_android.so:libclang_rt.asan-arm-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so
 namespace.sphal.link.com_android_neuralnetworks.shared_libs = libneuralnetworks.so
diff --git a/testdata/golden_output/deprecate_vndk/com.android.conscrypt/ld.config.txt b/testdata/golden_output/deprecate_vndk/com.android.conscrypt/ld.config.txt
index 943486a..dde7cc8 100644
--- a/testdata/golden_output/deprecate_vndk/com.android.conscrypt/ld.config.txt
+++ b/testdata/golden_output/deprecate_vndk/com.android.conscrypt/ld.config.txt
@@ -217,12 +217,10 @@ namespace.sphal.search.paths = /odm/${LIB}
 namespace.sphal.search.paths += /vendor/${LIB}
 namespace.sphal.search.paths += /vendor/${LIB}/egl
 namespace.sphal.search.paths += /vendor/${LIB}/hw
-namespace.sphal.search.paths += /apex/com.vendor.service2/${LIB}/egl
 namespace.sphal.permitted.paths = /odm/${LIB}
 namespace.sphal.permitted.paths += /vendor/${LIB}
 namespace.sphal.permitted.paths += /vendor/odm/${LIB}
 namespace.sphal.permitted.paths += /system/vendor/${LIB}
-namespace.sphal.permitted.paths += /apex/com.vendor.service2/${LIB}/egl
 namespace.sphal.asan.search.paths = /data/asan/odm/${LIB}
 namespace.sphal.asan.search.paths += /odm/${LIB}
 namespace.sphal.asan.search.paths += /data/asan/vendor/${LIB}
@@ -231,7 +229,6 @@ namespace.sphal.asan.search.paths += /data/asan/vendor/${LIB}/egl
 namespace.sphal.asan.search.paths += /vendor/${LIB}/egl
 namespace.sphal.asan.search.paths += /data/asan/vendor/${LIB}/hw
 namespace.sphal.asan.search.paths += /vendor/${LIB}/hw
-namespace.sphal.asan.search.paths += /apex/com.vendor.service2/${LIB}/egl
 namespace.sphal.asan.permitted.paths = /data/asan/odm/${LIB}
 namespace.sphal.asan.permitted.paths += /odm/${LIB}
 namespace.sphal.asan.permitted.paths += /data/asan/vendor/${LIB}
@@ -240,7 +237,6 @@ namespace.sphal.asan.permitted.paths += /data/asan/vendor/odm/${LIB}
 namespace.sphal.asan.permitted.paths += /vendor/odm/${LIB}
 namespace.sphal.asan.permitted.paths += /data/asan/system/vendor/${LIB}
 namespace.sphal.asan.permitted.paths += /system/vendor/${LIB}
-namespace.sphal.asan.permitted.paths += /apex/com.vendor.service2/${LIB}/egl
 namespace.sphal.hwasan.search.paths = /odm/${LIB}/hwasan
 namespace.sphal.hwasan.search.paths += /odm/${LIB}
 namespace.sphal.hwasan.search.paths += /vendor/${LIB}/hwasan
@@ -249,8 +245,6 @@ namespace.sphal.hwasan.search.paths += /vendor/${LIB}/egl/hwasan
 namespace.sphal.hwasan.search.paths += /vendor/${LIB}/egl
 namespace.sphal.hwasan.search.paths += /vendor/${LIB}/hw/hwasan
 namespace.sphal.hwasan.search.paths += /vendor/${LIB}/hw
-namespace.sphal.hwasan.search.paths += /apex/com.vendor.service2/${LIB}/egl/hwasan
-namespace.sphal.hwasan.search.paths += /apex/com.vendor.service2/${LIB}/egl
 namespace.sphal.hwasan.permitted.paths = /odm/${LIB}/hwasan
 namespace.sphal.hwasan.permitted.paths += /odm/${LIB}
 namespace.sphal.hwasan.permitted.paths += /vendor/${LIB}/hwasan
@@ -259,8 +253,6 @@ namespace.sphal.hwasan.permitted.paths += /vendor/odm/${LIB}/hwasan
 namespace.sphal.hwasan.permitted.paths += /vendor/odm/${LIB}
 namespace.sphal.hwasan.permitted.paths += /system/vendor/${LIB}/hwasan
 namespace.sphal.hwasan.permitted.paths += /system/vendor/${LIB}
-namespace.sphal.hwasan.permitted.paths += /apex/com.vendor.service2/${LIB}/egl/hwasan
-namespace.sphal.hwasan.permitted.paths += /apex/com.vendor.service2/${LIB}/egl
 namespace.sphal.links = system,com_android_neuralnetworks
 namespace.sphal.link.system.shared_libs = libEGL.so:libGLESv1_CM.so:libGLESv2.so:libGLESv3.so:libRS.so:libandroid_net.so:libbinder_ndk.so:libc.so:libcgrouprc.so:libclang_rt.asan-i686-android.so:libdl.so:libft2.so:liblog.so:libm.so:libmediandk.so:libnativewindow.so:libsync.so:libvndksupport.so:libvulkan.so:libdl_android.so:libclang_rt.asan-arm-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so
 namespace.sphal.link.com_android_neuralnetworks.shared_libs = libneuralnetworks.so
diff --git a/testdata/golden_output/deprecate_vndk/com.android.media.swcodec/ld.config.txt b/testdata/golden_output/deprecate_vndk/com.android.media.swcodec/ld.config.txt
index fd39727..e30dfe0 100644
--- a/testdata/golden_output/deprecate_vndk/com.android.media.swcodec/ld.config.txt
+++ b/testdata/golden_output/deprecate_vndk/com.android.media.swcodec/ld.config.txt
@@ -216,12 +216,10 @@ namespace.sphal.search.paths = /odm/${LIB}
 namespace.sphal.search.paths += /vendor/${LIB}
 namespace.sphal.search.paths += /vendor/${LIB}/egl
 namespace.sphal.search.paths += /vendor/${LIB}/hw
-namespace.sphal.search.paths += /apex/com.vendor.service2/${LIB}/egl
 namespace.sphal.permitted.paths = /odm/${LIB}
 namespace.sphal.permitted.paths += /vendor/${LIB}
 namespace.sphal.permitted.paths += /vendor/odm/${LIB}
 namespace.sphal.permitted.paths += /system/vendor/${LIB}
-namespace.sphal.permitted.paths += /apex/com.vendor.service2/${LIB}/egl
 namespace.sphal.asan.search.paths = /data/asan/odm/${LIB}
 namespace.sphal.asan.search.paths += /odm/${LIB}
 namespace.sphal.asan.search.paths += /data/asan/vendor/${LIB}
@@ -230,7 +228,6 @@ namespace.sphal.asan.search.paths += /data/asan/vendor/${LIB}/egl
 namespace.sphal.asan.search.paths += /vendor/${LIB}/egl
 namespace.sphal.asan.search.paths += /data/asan/vendor/${LIB}/hw
 namespace.sphal.asan.search.paths += /vendor/${LIB}/hw
-namespace.sphal.asan.search.paths += /apex/com.vendor.service2/${LIB}/egl
 namespace.sphal.asan.permitted.paths = /data/asan/odm/${LIB}
 namespace.sphal.asan.permitted.paths += /odm/${LIB}
 namespace.sphal.asan.permitted.paths += /data/asan/vendor/${LIB}
@@ -239,7 +236,6 @@ namespace.sphal.asan.permitted.paths += /data/asan/vendor/odm/${LIB}
 namespace.sphal.asan.permitted.paths += /vendor/odm/${LIB}
 namespace.sphal.asan.permitted.paths += /data/asan/system/vendor/${LIB}
 namespace.sphal.asan.permitted.paths += /system/vendor/${LIB}
-namespace.sphal.asan.permitted.paths += /apex/com.vendor.service2/${LIB}/egl
 namespace.sphal.hwasan.search.paths = /odm/${LIB}/hwasan
 namespace.sphal.hwasan.search.paths += /odm/${LIB}
 namespace.sphal.hwasan.search.paths += /vendor/${LIB}/hwasan
@@ -248,8 +244,6 @@ namespace.sphal.hwasan.search.paths += /vendor/${LIB}/egl/hwasan
 namespace.sphal.hwasan.search.paths += /vendor/${LIB}/egl
 namespace.sphal.hwasan.search.paths += /vendor/${LIB}/hw/hwasan
 namespace.sphal.hwasan.search.paths += /vendor/${LIB}/hw
-namespace.sphal.hwasan.search.paths += /apex/com.vendor.service2/${LIB}/egl/hwasan
-namespace.sphal.hwasan.search.paths += /apex/com.vendor.service2/${LIB}/egl
 namespace.sphal.hwasan.permitted.paths = /odm/${LIB}/hwasan
 namespace.sphal.hwasan.permitted.paths += /odm/${LIB}
 namespace.sphal.hwasan.permitted.paths += /vendor/${LIB}/hwasan
@@ -258,8 +252,6 @@ namespace.sphal.hwasan.permitted.paths += /vendor/odm/${LIB}/hwasan
 namespace.sphal.hwasan.permitted.paths += /vendor/odm/${LIB}
 namespace.sphal.hwasan.permitted.paths += /system/vendor/${LIB}/hwasan
 namespace.sphal.hwasan.permitted.paths += /system/vendor/${LIB}
-namespace.sphal.hwasan.permitted.paths += /apex/com.vendor.service2/${LIB}/egl/hwasan
-namespace.sphal.hwasan.permitted.paths += /apex/com.vendor.service2/${LIB}/egl
 namespace.sphal.links = system,com_android_neuralnetworks
 namespace.sphal.link.system.shared_libs = libEGL.so:libGLESv1_CM.so:libGLESv2.so:libGLESv3.so:libRS.so:libandroid_net.so:libbinder_ndk.so:libc.so:libcgrouprc.so:libclang_rt.asan-i686-android.so:libdl.so:libft2.so:liblog.so:libm.so:libmediandk.so:libnativewindow.so:libsync.so:libvndksupport.so:libvulkan.so:libdl_android.so:libclang_rt.asan-arm-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so
 namespace.sphal.link.com_android_neuralnetworks.shared_libs = libneuralnetworks.so
diff --git a/testdata/golden_output/deprecate_vndk/com.android.runtime/ld.config.txt b/testdata/golden_output/deprecate_vndk/com.android.runtime/ld.config.txt
index 0ad3384..b601646 100644
--- a/testdata/golden_output/deprecate_vndk/com.android.runtime/ld.config.txt
+++ b/testdata/golden_output/deprecate_vndk/com.android.runtime/ld.config.txt
@@ -199,12 +199,10 @@ namespace.sphal.search.paths = /odm/${LIB}
 namespace.sphal.search.paths += /vendor/${LIB}
 namespace.sphal.search.paths += /vendor/${LIB}/egl
 namespace.sphal.search.paths += /vendor/${LIB}/hw
-namespace.sphal.search.paths += /apex/com.vendor.service2/${LIB}/egl
 namespace.sphal.permitted.paths = /odm/${LIB}
 namespace.sphal.permitted.paths += /vendor/${LIB}
 namespace.sphal.permitted.paths += /vendor/odm/${LIB}
 namespace.sphal.permitted.paths += /system/vendor/${LIB}
-namespace.sphal.permitted.paths += /apex/com.vendor.service2/${LIB}/egl
 namespace.sphal.asan.search.paths = /data/asan/odm/${LIB}
 namespace.sphal.asan.search.paths += /odm/${LIB}
 namespace.sphal.asan.search.paths += /data/asan/vendor/${LIB}
@@ -213,7 +211,6 @@ namespace.sphal.asan.search.paths += /data/asan/vendor/${LIB}/egl
 namespace.sphal.asan.search.paths += /vendor/${LIB}/egl
 namespace.sphal.asan.search.paths += /data/asan/vendor/${LIB}/hw
 namespace.sphal.asan.search.paths += /vendor/${LIB}/hw
-namespace.sphal.asan.search.paths += /apex/com.vendor.service2/${LIB}/egl
 namespace.sphal.asan.permitted.paths = /data/asan/odm/${LIB}
 namespace.sphal.asan.permitted.paths += /odm/${LIB}
 namespace.sphal.asan.permitted.paths += /data/asan/vendor/${LIB}
@@ -222,7 +219,6 @@ namespace.sphal.asan.permitted.paths += /data/asan/vendor/odm/${LIB}
 namespace.sphal.asan.permitted.paths += /vendor/odm/${LIB}
 namespace.sphal.asan.permitted.paths += /data/asan/system/vendor/${LIB}
 namespace.sphal.asan.permitted.paths += /system/vendor/${LIB}
-namespace.sphal.asan.permitted.paths += /apex/com.vendor.service2/${LIB}/egl
 namespace.sphal.hwasan.search.paths = /odm/${LIB}/hwasan
 namespace.sphal.hwasan.search.paths += /odm/${LIB}
 namespace.sphal.hwasan.search.paths += /vendor/${LIB}/hwasan
@@ -231,8 +227,6 @@ namespace.sphal.hwasan.search.paths += /vendor/${LIB}/egl/hwasan
 namespace.sphal.hwasan.search.paths += /vendor/${LIB}/egl
 namespace.sphal.hwasan.search.paths += /vendor/${LIB}/hw/hwasan
 namespace.sphal.hwasan.search.paths += /vendor/${LIB}/hw
-namespace.sphal.hwasan.search.paths += /apex/com.vendor.service2/${LIB}/egl/hwasan
-namespace.sphal.hwasan.search.paths += /apex/com.vendor.service2/${LIB}/egl
 namespace.sphal.hwasan.permitted.paths = /odm/${LIB}/hwasan
 namespace.sphal.hwasan.permitted.paths += /odm/${LIB}
 namespace.sphal.hwasan.permitted.paths += /vendor/${LIB}/hwasan
@@ -241,8 +235,6 @@ namespace.sphal.hwasan.permitted.paths += /vendor/odm/${LIB}/hwasan
 namespace.sphal.hwasan.permitted.paths += /vendor/odm/${LIB}
 namespace.sphal.hwasan.permitted.paths += /system/vendor/${LIB}/hwasan
 namespace.sphal.hwasan.permitted.paths += /system/vendor/${LIB}
-namespace.sphal.hwasan.permitted.paths += /apex/com.vendor.service2/${LIB}/egl/hwasan
-namespace.sphal.hwasan.permitted.paths += /apex/com.vendor.service2/${LIB}/egl
 namespace.sphal.links = system,com_android_neuralnetworks
 namespace.sphal.link.system.shared_libs = libEGL.so:libGLESv1_CM.so:libGLESv2.so:libGLESv3.so:libRS.so:libandroid_net.so:libbinder_ndk.so:libc.so:libcgrouprc.so:libclang_rt.asan-i686-android.so:libdl.so:libft2.so:liblog.so:libm.so:libmediandk.so:libnativewindow.so:libsync.so:libvndksupport.so:libvulkan.so:libdl_android.so:libclang_rt.asan-arm-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so
 namespace.sphal.link.com_android_neuralnetworks.shared_libs = libneuralnetworks.so
diff --git a/testdata/golden_output/deprecate_vndk/com.android.sdkext/ld.config.txt b/testdata/golden_output/deprecate_vndk/com.android.sdkext/ld.config.txt
index f25ed1b..42c2ca9 100644
--- a/testdata/golden_output/deprecate_vndk/com.android.sdkext/ld.config.txt
+++ b/testdata/golden_output/deprecate_vndk/com.android.sdkext/ld.config.txt
@@ -216,12 +216,10 @@ namespace.sphal.search.paths = /odm/${LIB}
 namespace.sphal.search.paths += /vendor/${LIB}
 namespace.sphal.search.paths += /vendor/${LIB}/egl
 namespace.sphal.search.paths += /vendor/${LIB}/hw
-namespace.sphal.search.paths += /apex/com.vendor.service2/${LIB}/egl
 namespace.sphal.permitted.paths = /odm/${LIB}
 namespace.sphal.permitted.paths += /vendor/${LIB}
 namespace.sphal.permitted.paths += /vendor/odm/${LIB}
 namespace.sphal.permitted.paths += /system/vendor/${LIB}
-namespace.sphal.permitted.paths += /apex/com.vendor.service2/${LIB}/egl
 namespace.sphal.asan.search.paths = /data/asan/odm/${LIB}
 namespace.sphal.asan.search.paths += /odm/${LIB}
 namespace.sphal.asan.search.paths += /data/asan/vendor/${LIB}
@@ -230,7 +228,6 @@ namespace.sphal.asan.search.paths += /data/asan/vendor/${LIB}/egl
 namespace.sphal.asan.search.paths += /vendor/${LIB}/egl
 namespace.sphal.asan.search.paths += /data/asan/vendor/${LIB}/hw
 namespace.sphal.asan.search.paths += /vendor/${LIB}/hw
-namespace.sphal.asan.search.paths += /apex/com.vendor.service2/${LIB}/egl
 namespace.sphal.asan.permitted.paths = /data/asan/odm/${LIB}
 namespace.sphal.asan.permitted.paths += /odm/${LIB}
 namespace.sphal.asan.permitted.paths += /data/asan/vendor/${LIB}
@@ -239,7 +236,6 @@ namespace.sphal.asan.permitted.paths += /data/asan/vendor/odm/${LIB}
 namespace.sphal.asan.permitted.paths += /vendor/odm/${LIB}
 namespace.sphal.asan.permitted.paths += /data/asan/system/vendor/${LIB}
 namespace.sphal.asan.permitted.paths += /system/vendor/${LIB}
-namespace.sphal.asan.permitted.paths += /apex/com.vendor.service2/${LIB}/egl
 namespace.sphal.hwasan.search.paths = /odm/${LIB}/hwasan
 namespace.sphal.hwasan.search.paths += /odm/${LIB}
 namespace.sphal.hwasan.search.paths += /vendor/${LIB}/hwasan
@@ -248,8 +244,6 @@ namespace.sphal.hwasan.search.paths += /vendor/${LIB}/egl/hwasan
 namespace.sphal.hwasan.search.paths += /vendor/${LIB}/egl
 namespace.sphal.hwasan.search.paths += /vendor/${LIB}/hw/hwasan
 namespace.sphal.hwasan.search.paths += /vendor/${LIB}/hw
-namespace.sphal.hwasan.search.paths += /apex/com.vendor.service2/${LIB}/egl/hwasan
-namespace.sphal.hwasan.search.paths += /apex/com.vendor.service2/${LIB}/egl
 namespace.sphal.hwasan.permitted.paths = /odm/${LIB}/hwasan
 namespace.sphal.hwasan.permitted.paths += /odm/${LIB}
 namespace.sphal.hwasan.permitted.paths += /vendor/${LIB}/hwasan
@@ -258,8 +252,6 @@ namespace.sphal.hwasan.permitted.paths += /vendor/odm/${LIB}/hwasan
 namespace.sphal.hwasan.permitted.paths += /vendor/odm/${LIB}
 namespace.sphal.hwasan.permitted.paths += /system/vendor/${LIB}/hwasan
 namespace.sphal.hwasan.permitted.paths += /system/vendor/${LIB}
-namespace.sphal.hwasan.permitted.paths += /apex/com.vendor.service2/${LIB}/egl/hwasan
-namespace.sphal.hwasan.permitted.paths += /apex/com.vendor.service2/${LIB}/egl
 namespace.sphal.links = system,com_android_neuralnetworks
 namespace.sphal.link.system.shared_libs = libEGL.so:libGLESv1_CM.so:libGLESv2.so:libGLESv3.so:libRS.so:libandroid_net.so:libbinder_ndk.so:libc.so:libcgrouprc.so:libclang_rt.asan-i686-android.so:libdl.so:libft2.so:liblog.so:libm.so:libmediandk.so:libnativewindow.so:libsync.so:libvndksupport.so:libvulkan.so:libdl_android.so:libclang_rt.asan-arm-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so
 namespace.sphal.link.com_android_neuralnetworks.shared_libs = libneuralnetworks.so
diff --git a/testdata/golden_output/deprecate_vndk/com.product.service1/ld.config.txt b/testdata/golden_output/deprecate_vndk/com.product.service1/ld.config.txt
index 42c65a6..88a1e0c 100644
--- a/testdata/golden_output/deprecate_vndk/com.product.service1/ld.config.txt
+++ b/testdata/golden_output/deprecate_vndk/com.product.service1/ld.config.txt
@@ -232,12 +232,10 @@ namespace.sphal.search.paths = /odm/${LIB}
 namespace.sphal.search.paths += /vendor/${LIB}
 namespace.sphal.search.paths += /vendor/${LIB}/egl
 namespace.sphal.search.paths += /vendor/${LIB}/hw
-namespace.sphal.search.paths += /apex/com.vendor.service2/${LIB}/egl
 namespace.sphal.permitted.paths = /odm/${LIB}
 namespace.sphal.permitted.paths += /vendor/${LIB}
 namespace.sphal.permitted.paths += /vendor/odm/${LIB}
 namespace.sphal.permitted.paths += /system/vendor/${LIB}
-namespace.sphal.permitted.paths += /apex/com.vendor.service2/${LIB}/egl
 namespace.sphal.asan.search.paths = /data/asan/odm/${LIB}
 namespace.sphal.asan.search.paths += /odm/${LIB}
 namespace.sphal.asan.search.paths += /data/asan/vendor/${LIB}
@@ -246,7 +244,6 @@ namespace.sphal.asan.search.paths += /data/asan/vendor/${LIB}/egl
 namespace.sphal.asan.search.paths += /vendor/${LIB}/egl
 namespace.sphal.asan.search.paths += /data/asan/vendor/${LIB}/hw
 namespace.sphal.asan.search.paths += /vendor/${LIB}/hw
-namespace.sphal.asan.search.paths += /apex/com.vendor.service2/${LIB}/egl
 namespace.sphal.asan.permitted.paths = /data/asan/odm/${LIB}
 namespace.sphal.asan.permitted.paths += /odm/${LIB}
 namespace.sphal.asan.permitted.paths += /data/asan/vendor/${LIB}
@@ -255,7 +252,6 @@ namespace.sphal.asan.permitted.paths += /data/asan/vendor/odm/${LIB}
 namespace.sphal.asan.permitted.paths += /vendor/odm/${LIB}
 namespace.sphal.asan.permitted.paths += /data/asan/system/vendor/${LIB}
 namespace.sphal.asan.permitted.paths += /system/vendor/${LIB}
-namespace.sphal.asan.permitted.paths += /apex/com.vendor.service2/${LIB}/egl
 namespace.sphal.hwasan.search.paths = /odm/${LIB}/hwasan
 namespace.sphal.hwasan.search.paths += /odm/${LIB}
 namespace.sphal.hwasan.search.paths += /vendor/${LIB}/hwasan
@@ -264,8 +260,6 @@ namespace.sphal.hwasan.search.paths += /vendor/${LIB}/egl/hwasan
 namespace.sphal.hwasan.search.paths += /vendor/${LIB}/egl
 namespace.sphal.hwasan.search.paths += /vendor/${LIB}/hw/hwasan
 namespace.sphal.hwasan.search.paths += /vendor/${LIB}/hw
-namespace.sphal.hwasan.search.paths += /apex/com.vendor.service2/${LIB}/egl/hwasan
-namespace.sphal.hwasan.search.paths += /apex/com.vendor.service2/${LIB}/egl
 namespace.sphal.hwasan.permitted.paths = /odm/${LIB}/hwasan
 namespace.sphal.hwasan.permitted.paths += /odm/${LIB}
 namespace.sphal.hwasan.permitted.paths += /vendor/${LIB}/hwasan
@@ -274,8 +268,6 @@ namespace.sphal.hwasan.permitted.paths += /vendor/odm/${LIB}/hwasan
 namespace.sphal.hwasan.permitted.paths += /vendor/odm/${LIB}
 namespace.sphal.hwasan.permitted.paths += /system/vendor/${LIB}/hwasan
 namespace.sphal.hwasan.permitted.paths += /system/vendor/${LIB}
-namespace.sphal.hwasan.permitted.paths += /apex/com.vendor.service2/${LIB}/egl/hwasan
-namespace.sphal.hwasan.permitted.paths += /apex/com.vendor.service2/${LIB}/egl
 namespace.sphal.links = system,com_android_neuralnetworks
 namespace.sphal.link.system.shared_libs = libEGL.so:libGLESv1_CM.so:libGLESv2.so:libGLESv3.so:libRS.so:libandroid_net.so:libbinder_ndk.so:libc.so:libcgrouprc.so:libclang_rt.asan-i686-android.so:libdl.so:libft2.so:liblog.so:libm.so:libmediandk.so:libnativewindow.so:libsync.so:libvndksupport.so:libvulkan.so:libdl_android.so:libclang_rt.asan-arm-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so
 namespace.sphal.link.com_android_neuralnetworks.shared_libs = libneuralnetworks.so
diff --git a/testdata/golden_output/deprecate_vndk/ld.config.txt b/testdata/golden_output/deprecate_vndk/ld.config.txt
index 13b476a..754b031 100644
--- a/testdata/golden_output/deprecate_vndk/ld.config.txt
+++ b/testdata/golden_output/deprecate_vndk/ld.config.txt
@@ -480,12 +480,10 @@ namespace.sphal.search.paths = /odm/${LIB}
 namespace.sphal.search.paths += /vendor/${LIB}
 namespace.sphal.search.paths += /vendor/${LIB}/egl
 namespace.sphal.search.paths += /vendor/${LIB}/hw
-namespace.sphal.search.paths += /apex/com.vendor.service2/${LIB}/egl
 namespace.sphal.permitted.paths = /odm/${LIB}
 namespace.sphal.permitted.paths += /vendor/${LIB}
 namespace.sphal.permitted.paths += /vendor/odm/${LIB}
 namespace.sphal.permitted.paths += /system/vendor/${LIB}
-namespace.sphal.permitted.paths += /apex/com.vendor.service2/${LIB}/egl
 namespace.sphal.asan.search.paths = /data/asan/odm/${LIB}
 namespace.sphal.asan.search.paths += /odm/${LIB}
 namespace.sphal.asan.search.paths += /data/asan/vendor/${LIB}
@@ -494,7 +492,6 @@ namespace.sphal.asan.search.paths += /data/asan/vendor/${LIB}/egl
 namespace.sphal.asan.search.paths += /vendor/${LIB}/egl
 namespace.sphal.asan.search.paths += /data/asan/vendor/${LIB}/hw
 namespace.sphal.asan.search.paths += /vendor/${LIB}/hw
-namespace.sphal.asan.search.paths += /apex/com.vendor.service2/${LIB}/egl
 namespace.sphal.asan.permitted.paths = /data/asan/odm/${LIB}
 namespace.sphal.asan.permitted.paths += /odm/${LIB}
 namespace.sphal.asan.permitted.paths += /data/asan/vendor/${LIB}
@@ -503,7 +500,6 @@ namespace.sphal.asan.permitted.paths += /data/asan/vendor/odm/${LIB}
 namespace.sphal.asan.permitted.paths += /vendor/odm/${LIB}
 namespace.sphal.asan.permitted.paths += /data/asan/system/vendor/${LIB}
 namespace.sphal.asan.permitted.paths += /system/vendor/${LIB}
-namespace.sphal.asan.permitted.paths += /apex/com.vendor.service2/${LIB}/egl
 namespace.sphal.hwasan.search.paths = /odm/${LIB}/hwasan
 namespace.sphal.hwasan.search.paths += /odm/${LIB}
 namespace.sphal.hwasan.search.paths += /vendor/${LIB}/hwasan
@@ -512,8 +508,6 @@ namespace.sphal.hwasan.search.paths += /vendor/${LIB}/egl/hwasan
 namespace.sphal.hwasan.search.paths += /vendor/${LIB}/egl
 namespace.sphal.hwasan.search.paths += /vendor/${LIB}/hw/hwasan
 namespace.sphal.hwasan.search.paths += /vendor/${LIB}/hw
-namespace.sphal.hwasan.search.paths += /apex/com.vendor.service2/${LIB}/egl/hwasan
-namespace.sphal.hwasan.search.paths += /apex/com.vendor.service2/${LIB}/egl
 namespace.sphal.hwasan.permitted.paths = /odm/${LIB}/hwasan
 namespace.sphal.hwasan.permitted.paths += /odm/${LIB}
 namespace.sphal.hwasan.permitted.paths += /vendor/${LIB}/hwasan
@@ -522,8 +516,6 @@ namespace.sphal.hwasan.permitted.paths += /vendor/odm/${LIB}/hwasan
 namespace.sphal.hwasan.permitted.paths += /vendor/odm/${LIB}
 namespace.sphal.hwasan.permitted.paths += /system/vendor/${LIB}/hwasan
 namespace.sphal.hwasan.permitted.paths += /system/vendor/${LIB}
-namespace.sphal.hwasan.permitted.paths += /apex/com.vendor.service2/${LIB}/egl/hwasan
-namespace.sphal.hwasan.permitted.paths += /apex/com.vendor.service2/${LIB}/egl
 namespace.sphal.links = default,rs,com_android_neuralnetworks
 namespace.sphal.link.default.shared_libs = libEGL.so:libGLESv1_CM.so:libGLESv2.so:libGLESv3.so:libRS.so:libandroid_net.so:libbinder_ndk.so:libc.so:libcgrouprc.so:libclang_rt.asan-i686-android.so:libdl.so:libft2.so:liblog.so:libm.so:libmediandk.so:libnativewindow.so:libsync.so:libvndksupport.so:libvulkan.so:libdl_android.so:libclang_rt.asan-arm-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so
 namespace.sphal.link.rs.shared_libs = libRS_internal.so
@@ -1672,12 +1664,10 @@ namespace.sphal.search.paths = /odm/${LIB}
 namespace.sphal.search.paths += /vendor/${LIB}
 namespace.sphal.search.paths += /vendor/${LIB}/egl
 namespace.sphal.search.paths += /vendor/${LIB}/hw
-namespace.sphal.search.paths += /apex/com.vendor.service2/${LIB}/egl
 namespace.sphal.permitted.paths = /odm/${LIB}
 namespace.sphal.permitted.paths += /vendor/${LIB}
 namespace.sphal.permitted.paths += /vendor/odm/${LIB}
 namespace.sphal.permitted.paths += /system/vendor/${LIB}
-namespace.sphal.permitted.paths += /apex/com.vendor.service2/${LIB}/egl
 namespace.sphal.asan.search.paths = /data/asan/odm/${LIB}
 namespace.sphal.asan.search.paths += /odm/${LIB}
 namespace.sphal.asan.search.paths += /data/asan/vendor/${LIB}
@@ -1686,7 +1676,6 @@ namespace.sphal.asan.search.paths += /data/asan/vendor/${LIB}/egl
 namespace.sphal.asan.search.paths += /vendor/${LIB}/egl
 namespace.sphal.asan.search.paths += /data/asan/vendor/${LIB}/hw
 namespace.sphal.asan.search.paths += /vendor/${LIB}/hw
-namespace.sphal.asan.search.paths += /apex/com.vendor.service2/${LIB}/egl
 namespace.sphal.asan.permitted.paths = /data/asan/odm/${LIB}
 namespace.sphal.asan.permitted.paths += /odm/${LIB}
 namespace.sphal.asan.permitted.paths += /data/asan/vendor/${LIB}
@@ -1695,7 +1684,6 @@ namespace.sphal.asan.permitted.paths += /data/asan/vendor/odm/${LIB}
 namespace.sphal.asan.permitted.paths += /vendor/odm/${LIB}
 namespace.sphal.asan.permitted.paths += /data/asan/system/vendor/${LIB}
 namespace.sphal.asan.permitted.paths += /system/vendor/${LIB}
-namespace.sphal.asan.permitted.paths += /apex/com.vendor.service2/${LIB}/egl
 namespace.sphal.hwasan.search.paths = /odm/${LIB}/hwasan
 namespace.sphal.hwasan.search.paths += /odm/${LIB}
 namespace.sphal.hwasan.search.paths += /vendor/${LIB}/hwasan
@@ -1704,8 +1692,6 @@ namespace.sphal.hwasan.search.paths += /vendor/${LIB}/egl/hwasan
 namespace.sphal.hwasan.search.paths += /vendor/${LIB}/egl
 namespace.sphal.hwasan.search.paths += /vendor/${LIB}/hw/hwasan
 namespace.sphal.hwasan.search.paths += /vendor/${LIB}/hw
-namespace.sphal.hwasan.search.paths += /apex/com.vendor.service2/${LIB}/egl/hwasan
-namespace.sphal.hwasan.search.paths += /apex/com.vendor.service2/${LIB}/egl
 namespace.sphal.hwasan.permitted.paths = /odm/${LIB}/hwasan
 namespace.sphal.hwasan.permitted.paths += /odm/${LIB}
 namespace.sphal.hwasan.permitted.paths += /vendor/${LIB}/hwasan
@@ -1714,8 +1700,6 @@ namespace.sphal.hwasan.permitted.paths += /vendor/odm/${LIB}/hwasan
 namespace.sphal.hwasan.permitted.paths += /vendor/odm/${LIB}
 namespace.sphal.hwasan.permitted.paths += /system/vendor/${LIB}/hwasan
 namespace.sphal.hwasan.permitted.paths += /system/vendor/${LIB}
-namespace.sphal.hwasan.permitted.paths += /apex/com.vendor.service2/${LIB}/egl/hwasan
-namespace.sphal.hwasan.permitted.paths += /apex/com.vendor.service2/${LIB}/egl
 namespace.sphal.links = default,rs,com_android_neuralnetworks
 namespace.sphal.link.default.shared_libs = libEGL.so:libGLESv1_CM.so:libGLESv2.so:libGLESv3.so:libRS.so:libandroid_net.so:libbinder_ndk.so:libc.so:libcgrouprc.so:libclang_rt.asan-i686-android.so:libdl.so:libft2.so:liblog.so:libm.so:libmediandk.so:libnativewindow.so:libsync.so:libvndksupport.so:libvulkan.so:libdl_android.so:libclang_rt.asan-arm-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so
 namespace.sphal.link.rs.shared_libs = libRS_internal.so
diff --git a/testdata/golden_output/guest/com.android.adbd/ld.config.txt b/testdata/golden_output/guest/com.android.adbd/ld.config.txt
index afdceb6..0cb10ea 100644
--- a/testdata/golden_output/guest/com.android.adbd/ld.config.txt
+++ b/testdata/golden_output/guest/com.android.adbd/ld.config.txt
@@ -195,12 +195,10 @@ namespace.sphal.search.paths = /odm/${LIB}
 namespace.sphal.search.paths += /vendor/${LIB}
 namespace.sphal.search.paths += /vendor/${LIB}/egl
 namespace.sphal.search.paths += /vendor/${LIB}/hw
-namespace.sphal.search.paths += /apex/com.vendor.service2/${LIB}/egl
 namespace.sphal.permitted.paths = /odm/${LIB}
 namespace.sphal.permitted.paths += /vendor/${LIB}
 namespace.sphal.permitted.paths += /vendor/odm/${LIB}
 namespace.sphal.permitted.paths += /system/vendor/${LIB}
-namespace.sphal.permitted.paths += /apex/com.vendor.service2/${LIB}/egl
 namespace.sphal.asan.search.paths = /data/asan/odm/${LIB}
 namespace.sphal.asan.search.paths += /odm/${LIB}
 namespace.sphal.asan.search.paths += /data/asan/vendor/${LIB}
@@ -209,7 +207,6 @@ namespace.sphal.asan.search.paths += /data/asan/vendor/${LIB}/egl
 namespace.sphal.asan.search.paths += /vendor/${LIB}/egl
 namespace.sphal.asan.search.paths += /data/asan/vendor/${LIB}/hw
 namespace.sphal.asan.search.paths += /vendor/${LIB}/hw
-namespace.sphal.asan.search.paths += /apex/com.vendor.service2/${LIB}/egl
 namespace.sphal.asan.permitted.paths = /data/asan/odm/${LIB}
 namespace.sphal.asan.permitted.paths += /odm/${LIB}
 namespace.sphal.asan.permitted.paths += /data/asan/vendor/${LIB}
@@ -218,7 +215,6 @@ namespace.sphal.asan.permitted.paths += /data/asan/vendor/odm/${LIB}
 namespace.sphal.asan.permitted.paths += /vendor/odm/${LIB}
 namespace.sphal.asan.permitted.paths += /data/asan/system/vendor/${LIB}
 namespace.sphal.asan.permitted.paths += /system/vendor/${LIB}
-namespace.sphal.asan.permitted.paths += /apex/com.vendor.service2/${LIB}/egl
 namespace.sphal.hwasan.search.paths = /odm/${LIB}/hwasan
 namespace.sphal.hwasan.search.paths += /odm/${LIB}
 namespace.sphal.hwasan.search.paths += /vendor/${LIB}/hwasan
@@ -227,8 +223,6 @@ namespace.sphal.hwasan.search.paths += /vendor/${LIB}/egl/hwasan
 namespace.sphal.hwasan.search.paths += /vendor/${LIB}/egl
 namespace.sphal.hwasan.search.paths += /vendor/${LIB}/hw/hwasan
 namespace.sphal.hwasan.search.paths += /vendor/${LIB}/hw
-namespace.sphal.hwasan.search.paths += /apex/com.vendor.service2/${LIB}/egl/hwasan
-namespace.sphal.hwasan.search.paths += /apex/com.vendor.service2/${LIB}/egl
 namespace.sphal.hwasan.permitted.paths = /odm/${LIB}/hwasan
 namespace.sphal.hwasan.permitted.paths += /odm/${LIB}
 namespace.sphal.hwasan.permitted.paths += /vendor/${LIB}/hwasan
@@ -237,8 +231,6 @@ namespace.sphal.hwasan.permitted.paths += /vendor/odm/${LIB}/hwasan
 namespace.sphal.hwasan.permitted.paths += /vendor/odm/${LIB}
 namespace.sphal.hwasan.permitted.paths += /system/vendor/${LIB}/hwasan
 namespace.sphal.hwasan.permitted.paths += /system/vendor/${LIB}
-namespace.sphal.hwasan.permitted.paths += /apex/com.vendor.service2/${LIB}/egl/hwasan
-namespace.sphal.hwasan.permitted.paths += /apex/com.vendor.service2/${LIB}/egl
 namespace.sphal.links = system,vndk,com_android_neuralnetworks
 namespace.sphal.link.system.shared_libs = libEGL.so:libGLESv1_CM.so:libGLESv2.so:libGLESv3.so:libRS.so:libandroid_net.so:libbinder_ndk.so:libc.so:libcgrouprc.so:libclang_rt.asan-i686-android.so:libdl.so:liblog.so:libm.so:libmediandk.so:libnativewindow.so:libsync.so:libvndksupport.so:libvulkan.so:libdl_android.so:libclang_rt.asan-arm-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so
 namespace.sphal.link.vndk.shared_libs = android.hardware.graphics.common@1.0.so:android.hardware.graphics.common@1.1.so:android.hardware.graphics.common@1.2.so:android.hardware.graphics.mapper@2.0.so:android.hardware.graphics.mapper@2.1.so:android.hardware.graphics.mapper@3.0.so:android.hardware.renderscript@1.0.so:android.hidl.memory.token@1.0.so:android.hidl.memory@1.0-impl.so:android.hidl.memory@1.0.so:android.hidl.safe_union@1.0.so:libRSCpuRef.so:libRSDriver.so:libRS_internal.so:libbase.so:libbcinfo.so:libc++.so:libcutils.so:libhardware.so:libhidlbase.so:libhidlmemory.so:libion.so:libjsoncpp.so:liblzma.so:libprocessgroup.so:libunwindstack.so:libutils.so:libutilscallstack.so:libz.so
diff --git a/testdata/golden_output/guest/com.android.art/ld.config.txt b/testdata/golden_output/guest/com.android.art/ld.config.txt
index 22c5b51..f77f942 100644
--- a/testdata/golden_output/guest/com.android.art/ld.config.txt
+++ b/testdata/golden_output/guest/com.android.art/ld.config.txt
@@ -229,12 +229,10 @@ namespace.sphal.search.paths = /odm/${LIB}
 namespace.sphal.search.paths += /vendor/${LIB}
 namespace.sphal.search.paths += /vendor/${LIB}/egl
 namespace.sphal.search.paths += /vendor/${LIB}/hw
-namespace.sphal.search.paths += /apex/com.vendor.service2/${LIB}/egl
 namespace.sphal.permitted.paths = /odm/${LIB}
 namespace.sphal.permitted.paths += /vendor/${LIB}
 namespace.sphal.permitted.paths += /vendor/odm/${LIB}
 namespace.sphal.permitted.paths += /system/vendor/${LIB}
-namespace.sphal.permitted.paths += /apex/com.vendor.service2/${LIB}/egl
 namespace.sphal.asan.search.paths = /data/asan/odm/${LIB}
 namespace.sphal.asan.search.paths += /odm/${LIB}
 namespace.sphal.asan.search.paths += /data/asan/vendor/${LIB}
@@ -243,7 +241,6 @@ namespace.sphal.asan.search.paths += /data/asan/vendor/${LIB}/egl
 namespace.sphal.asan.search.paths += /vendor/${LIB}/egl
 namespace.sphal.asan.search.paths += /data/asan/vendor/${LIB}/hw
 namespace.sphal.asan.search.paths += /vendor/${LIB}/hw
-namespace.sphal.asan.search.paths += /apex/com.vendor.service2/${LIB}/egl
 namespace.sphal.asan.permitted.paths = /data/asan/odm/${LIB}
 namespace.sphal.asan.permitted.paths += /odm/${LIB}
 namespace.sphal.asan.permitted.paths += /data/asan/vendor/${LIB}
@@ -252,7 +249,6 @@ namespace.sphal.asan.permitted.paths += /data/asan/vendor/odm/${LIB}
 namespace.sphal.asan.permitted.paths += /vendor/odm/${LIB}
 namespace.sphal.asan.permitted.paths += /data/asan/system/vendor/${LIB}
 namespace.sphal.asan.permitted.paths += /system/vendor/${LIB}
-namespace.sphal.asan.permitted.paths += /apex/com.vendor.service2/${LIB}/egl
 namespace.sphal.hwasan.search.paths = /odm/${LIB}/hwasan
 namespace.sphal.hwasan.search.paths += /odm/${LIB}
 namespace.sphal.hwasan.search.paths += /vendor/${LIB}/hwasan
@@ -261,8 +257,6 @@ namespace.sphal.hwasan.search.paths += /vendor/${LIB}/egl/hwasan
 namespace.sphal.hwasan.search.paths += /vendor/${LIB}/egl
 namespace.sphal.hwasan.search.paths += /vendor/${LIB}/hw/hwasan
 namespace.sphal.hwasan.search.paths += /vendor/${LIB}/hw
-namespace.sphal.hwasan.search.paths += /apex/com.vendor.service2/${LIB}/egl/hwasan
-namespace.sphal.hwasan.search.paths += /apex/com.vendor.service2/${LIB}/egl
 namespace.sphal.hwasan.permitted.paths = /odm/${LIB}/hwasan
 namespace.sphal.hwasan.permitted.paths += /odm/${LIB}
 namespace.sphal.hwasan.permitted.paths += /vendor/${LIB}/hwasan
@@ -271,8 +265,6 @@ namespace.sphal.hwasan.permitted.paths += /vendor/odm/${LIB}/hwasan
 namespace.sphal.hwasan.permitted.paths += /vendor/odm/${LIB}
 namespace.sphal.hwasan.permitted.paths += /system/vendor/${LIB}/hwasan
 namespace.sphal.hwasan.permitted.paths += /system/vendor/${LIB}
-namespace.sphal.hwasan.permitted.paths += /apex/com.vendor.service2/${LIB}/egl/hwasan
-namespace.sphal.hwasan.permitted.paths += /apex/com.vendor.service2/${LIB}/egl
 namespace.sphal.links = system,vndk,com_android_neuralnetworks
 namespace.sphal.link.system.shared_libs = libEGL.so:libGLESv1_CM.so:libGLESv2.so:libGLESv3.so:libRS.so:libandroid_net.so:libbinder_ndk.so:libc.so:libcgrouprc.so:libclang_rt.asan-i686-android.so:libdl.so:liblog.so:libm.so:libmediandk.so:libnativewindow.so:libsync.so:libvndksupport.so:libvulkan.so:libdl_android.so:libclang_rt.asan-arm-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so
 namespace.sphal.link.vndk.shared_libs = android.hardware.graphics.common@1.0.so:android.hardware.graphics.common@1.1.so:android.hardware.graphics.common@1.2.so:android.hardware.graphics.mapper@2.0.so:android.hardware.graphics.mapper@2.1.so:android.hardware.graphics.mapper@3.0.so:android.hardware.renderscript@1.0.so:android.hidl.memory.token@1.0.so:android.hidl.memory@1.0-impl.so:android.hidl.memory@1.0.so:android.hidl.safe_union@1.0.so:libRSCpuRef.so:libRSDriver.so:libRS_internal.so:libbase.so:libbcinfo.so:libc++.so:libcutils.so:libhardware.so:libhidlbase.so:libhidlmemory.so:libion.so:libjsoncpp.so:liblzma.so:libprocessgroup.so:libunwindstack.so:libutils.so:libutilscallstack.so:libz.so
diff --git a/testdata/golden_output/guest/com.android.conscrypt/ld.config.txt b/testdata/golden_output/guest/com.android.conscrypt/ld.config.txt
index d2c1917..1dcea6e 100644
--- a/testdata/golden_output/guest/com.android.conscrypt/ld.config.txt
+++ b/testdata/golden_output/guest/com.android.conscrypt/ld.config.txt
@@ -217,12 +217,10 @@ namespace.sphal.search.paths = /odm/${LIB}
 namespace.sphal.search.paths += /vendor/${LIB}
 namespace.sphal.search.paths += /vendor/${LIB}/egl
 namespace.sphal.search.paths += /vendor/${LIB}/hw
-namespace.sphal.search.paths += /apex/com.vendor.service2/${LIB}/egl
 namespace.sphal.permitted.paths = /odm/${LIB}
 namespace.sphal.permitted.paths += /vendor/${LIB}
 namespace.sphal.permitted.paths += /vendor/odm/${LIB}
 namespace.sphal.permitted.paths += /system/vendor/${LIB}
-namespace.sphal.permitted.paths += /apex/com.vendor.service2/${LIB}/egl
 namespace.sphal.asan.search.paths = /data/asan/odm/${LIB}
 namespace.sphal.asan.search.paths += /odm/${LIB}
 namespace.sphal.asan.search.paths += /data/asan/vendor/${LIB}
@@ -231,7 +229,6 @@ namespace.sphal.asan.search.paths += /data/asan/vendor/${LIB}/egl
 namespace.sphal.asan.search.paths += /vendor/${LIB}/egl
 namespace.sphal.asan.search.paths += /data/asan/vendor/${LIB}/hw
 namespace.sphal.asan.search.paths += /vendor/${LIB}/hw
-namespace.sphal.asan.search.paths += /apex/com.vendor.service2/${LIB}/egl
 namespace.sphal.asan.permitted.paths = /data/asan/odm/${LIB}
 namespace.sphal.asan.permitted.paths += /odm/${LIB}
 namespace.sphal.asan.permitted.paths += /data/asan/vendor/${LIB}
@@ -240,7 +237,6 @@ namespace.sphal.asan.permitted.paths += /data/asan/vendor/odm/${LIB}
 namespace.sphal.asan.permitted.paths += /vendor/odm/${LIB}
 namespace.sphal.asan.permitted.paths += /data/asan/system/vendor/${LIB}
 namespace.sphal.asan.permitted.paths += /system/vendor/${LIB}
-namespace.sphal.asan.permitted.paths += /apex/com.vendor.service2/${LIB}/egl
 namespace.sphal.hwasan.search.paths = /odm/${LIB}/hwasan
 namespace.sphal.hwasan.search.paths += /odm/${LIB}
 namespace.sphal.hwasan.search.paths += /vendor/${LIB}/hwasan
@@ -249,8 +245,6 @@ namespace.sphal.hwasan.search.paths += /vendor/${LIB}/egl/hwasan
 namespace.sphal.hwasan.search.paths += /vendor/${LIB}/egl
 namespace.sphal.hwasan.search.paths += /vendor/${LIB}/hw/hwasan
 namespace.sphal.hwasan.search.paths += /vendor/${LIB}/hw
-namespace.sphal.hwasan.search.paths += /apex/com.vendor.service2/${LIB}/egl/hwasan
-namespace.sphal.hwasan.search.paths += /apex/com.vendor.service2/${LIB}/egl
 namespace.sphal.hwasan.permitted.paths = /odm/${LIB}/hwasan
 namespace.sphal.hwasan.permitted.paths += /odm/${LIB}
 namespace.sphal.hwasan.permitted.paths += /vendor/${LIB}/hwasan
@@ -259,8 +253,6 @@ namespace.sphal.hwasan.permitted.paths += /vendor/odm/${LIB}/hwasan
 namespace.sphal.hwasan.permitted.paths += /vendor/odm/${LIB}
 namespace.sphal.hwasan.permitted.paths += /system/vendor/${LIB}/hwasan
 namespace.sphal.hwasan.permitted.paths += /system/vendor/${LIB}
-namespace.sphal.hwasan.permitted.paths += /apex/com.vendor.service2/${LIB}/egl/hwasan
-namespace.sphal.hwasan.permitted.paths += /apex/com.vendor.service2/${LIB}/egl
 namespace.sphal.links = system,vndk,com_android_neuralnetworks
 namespace.sphal.link.system.shared_libs = libEGL.so:libGLESv1_CM.so:libGLESv2.so:libGLESv3.so:libRS.so:libandroid_net.so:libbinder_ndk.so:libc.so:libcgrouprc.so:libclang_rt.asan-i686-android.so:libdl.so:liblog.so:libm.so:libmediandk.so:libnativewindow.so:libsync.so:libvndksupport.so:libvulkan.so:libdl_android.so:libclang_rt.asan-arm-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so
 namespace.sphal.link.vndk.shared_libs = android.hardware.graphics.common@1.0.so:android.hardware.graphics.common@1.1.so:android.hardware.graphics.common@1.2.so:android.hardware.graphics.mapper@2.0.so:android.hardware.graphics.mapper@2.1.so:android.hardware.graphics.mapper@3.0.so:android.hardware.renderscript@1.0.so:android.hidl.memory.token@1.0.so:android.hidl.memory@1.0-impl.so:android.hidl.memory@1.0.so:android.hidl.safe_union@1.0.so:libRSCpuRef.so:libRSDriver.so:libRS_internal.so:libbase.so:libbcinfo.so:libc++.so:libcutils.so:libhardware.so:libhidlbase.so:libhidlmemory.so:libion.so:libjsoncpp.so:liblzma.so:libprocessgroup.so:libunwindstack.so:libutils.so:libutilscallstack.so:libz.so
diff --git a/testdata/golden_output/guest/com.android.media.swcodec/ld.config.txt b/testdata/golden_output/guest/com.android.media.swcodec/ld.config.txt
index 72fd31f..ad917a9 100644
--- a/testdata/golden_output/guest/com.android.media.swcodec/ld.config.txt
+++ b/testdata/golden_output/guest/com.android.media.swcodec/ld.config.txt
@@ -216,12 +216,10 @@ namespace.sphal.search.paths = /odm/${LIB}
 namespace.sphal.search.paths += /vendor/${LIB}
 namespace.sphal.search.paths += /vendor/${LIB}/egl
 namespace.sphal.search.paths += /vendor/${LIB}/hw
-namespace.sphal.search.paths += /apex/com.vendor.service2/${LIB}/egl
 namespace.sphal.permitted.paths = /odm/${LIB}
 namespace.sphal.permitted.paths += /vendor/${LIB}
 namespace.sphal.permitted.paths += /vendor/odm/${LIB}
 namespace.sphal.permitted.paths += /system/vendor/${LIB}
-namespace.sphal.permitted.paths += /apex/com.vendor.service2/${LIB}/egl
 namespace.sphal.asan.search.paths = /data/asan/odm/${LIB}
 namespace.sphal.asan.search.paths += /odm/${LIB}
 namespace.sphal.asan.search.paths += /data/asan/vendor/${LIB}
@@ -230,7 +228,6 @@ namespace.sphal.asan.search.paths += /data/asan/vendor/${LIB}/egl
 namespace.sphal.asan.search.paths += /vendor/${LIB}/egl
 namespace.sphal.asan.search.paths += /data/asan/vendor/${LIB}/hw
 namespace.sphal.asan.search.paths += /vendor/${LIB}/hw
-namespace.sphal.asan.search.paths += /apex/com.vendor.service2/${LIB}/egl
 namespace.sphal.asan.permitted.paths = /data/asan/odm/${LIB}
 namespace.sphal.asan.permitted.paths += /odm/${LIB}
 namespace.sphal.asan.permitted.paths += /data/asan/vendor/${LIB}
@@ -239,7 +236,6 @@ namespace.sphal.asan.permitted.paths += /data/asan/vendor/odm/${LIB}
 namespace.sphal.asan.permitted.paths += /vendor/odm/${LIB}
 namespace.sphal.asan.permitted.paths += /data/asan/system/vendor/${LIB}
 namespace.sphal.asan.permitted.paths += /system/vendor/${LIB}
-namespace.sphal.asan.permitted.paths += /apex/com.vendor.service2/${LIB}/egl
 namespace.sphal.hwasan.search.paths = /odm/${LIB}/hwasan
 namespace.sphal.hwasan.search.paths += /odm/${LIB}
 namespace.sphal.hwasan.search.paths += /vendor/${LIB}/hwasan
@@ -248,8 +244,6 @@ namespace.sphal.hwasan.search.paths += /vendor/${LIB}/egl/hwasan
 namespace.sphal.hwasan.search.paths += /vendor/${LIB}/egl
 namespace.sphal.hwasan.search.paths += /vendor/${LIB}/hw/hwasan
 namespace.sphal.hwasan.search.paths += /vendor/${LIB}/hw
-namespace.sphal.hwasan.search.paths += /apex/com.vendor.service2/${LIB}/egl/hwasan
-namespace.sphal.hwasan.search.paths += /apex/com.vendor.service2/${LIB}/egl
 namespace.sphal.hwasan.permitted.paths = /odm/${LIB}/hwasan
 namespace.sphal.hwasan.permitted.paths += /odm/${LIB}
 namespace.sphal.hwasan.permitted.paths += /vendor/${LIB}/hwasan
@@ -258,8 +252,6 @@ namespace.sphal.hwasan.permitted.paths += /vendor/odm/${LIB}/hwasan
 namespace.sphal.hwasan.permitted.paths += /vendor/odm/${LIB}
 namespace.sphal.hwasan.permitted.paths += /system/vendor/${LIB}/hwasan
 namespace.sphal.hwasan.permitted.paths += /system/vendor/${LIB}
-namespace.sphal.hwasan.permitted.paths += /apex/com.vendor.service2/${LIB}/egl/hwasan
-namespace.sphal.hwasan.permitted.paths += /apex/com.vendor.service2/${LIB}/egl
 namespace.sphal.links = system,vndk,com_android_neuralnetworks
 namespace.sphal.link.system.shared_libs = libEGL.so:libGLESv1_CM.so:libGLESv2.so:libGLESv3.so:libRS.so:libandroid_net.so:libbinder_ndk.so:libc.so:libcgrouprc.so:libclang_rt.asan-i686-android.so:libdl.so:liblog.so:libm.so:libmediandk.so:libnativewindow.so:libsync.so:libvndksupport.so:libvulkan.so:libdl_android.so:libclang_rt.asan-arm-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so
 namespace.sphal.link.vndk.shared_libs = android.hardware.graphics.common@1.0.so:android.hardware.graphics.common@1.1.so:android.hardware.graphics.common@1.2.so:android.hardware.graphics.mapper@2.0.so:android.hardware.graphics.mapper@2.1.so:android.hardware.graphics.mapper@3.0.so:android.hardware.renderscript@1.0.so:android.hidl.memory.token@1.0.so:android.hidl.memory@1.0-impl.so:android.hidl.memory@1.0.so:android.hidl.safe_union@1.0.so:libRSCpuRef.so:libRSDriver.so:libRS_internal.so:libbase.so:libbcinfo.so:libc++.so:libcutils.so:libhardware.so:libhidlbase.so:libhidlmemory.so:libion.so:libjsoncpp.so:liblzma.so:libprocessgroup.so:libunwindstack.so:libutils.so:libutilscallstack.so:libz.so
diff --git a/testdata/golden_output/guest/com.android.runtime/ld.config.txt b/testdata/golden_output/guest/com.android.runtime/ld.config.txt
index b7ccf80..c5a9dd0 100644
--- a/testdata/golden_output/guest/com.android.runtime/ld.config.txt
+++ b/testdata/golden_output/guest/com.android.runtime/ld.config.txt
@@ -199,12 +199,10 @@ namespace.sphal.search.paths = /odm/${LIB}
 namespace.sphal.search.paths += /vendor/${LIB}
 namespace.sphal.search.paths += /vendor/${LIB}/egl
 namespace.sphal.search.paths += /vendor/${LIB}/hw
-namespace.sphal.search.paths += /apex/com.vendor.service2/${LIB}/egl
 namespace.sphal.permitted.paths = /odm/${LIB}
 namespace.sphal.permitted.paths += /vendor/${LIB}
 namespace.sphal.permitted.paths += /vendor/odm/${LIB}
 namespace.sphal.permitted.paths += /system/vendor/${LIB}
-namespace.sphal.permitted.paths += /apex/com.vendor.service2/${LIB}/egl
 namespace.sphal.asan.search.paths = /data/asan/odm/${LIB}
 namespace.sphal.asan.search.paths += /odm/${LIB}
 namespace.sphal.asan.search.paths += /data/asan/vendor/${LIB}
@@ -213,7 +211,6 @@ namespace.sphal.asan.search.paths += /data/asan/vendor/${LIB}/egl
 namespace.sphal.asan.search.paths += /vendor/${LIB}/egl
 namespace.sphal.asan.search.paths += /data/asan/vendor/${LIB}/hw
 namespace.sphal.asan.search.paths += /vendor/${LIB}/hw
-namespace.sphal.asan.search.paths += /apex/com.vendor.service2/${LIB}/egl
 namespace.sphal.asan.permitted.paths = /data/asan/odm/${LIB}
 namespace.sphal.asan.permitted.paths += /odm/${LIB}
 namespace.sphal.asan.permitted.paths += /data/asan/vendor/${LIB}
@@ -222,7 +219,6 @@ namespace.sphal.asan.permitted.paths += /data/asan/vendor/odm/${LIB}
 namespace.sphal.asan.permitted.paths += /vendor/odm/${LIB}
 namespace.sphal.asan.permitted.paths += /data/asan/system/vendor/${LIB}
 namespace.sphal.asan.permitted.paths += /system/vendor/${LIB}
-namespace.sphal.asan.permitted.paths += /apex/com.vendor.service2/${LIB}/egl
 namespace.sphal.hwasan.search.paths = /odm/${LIB}/hwasan
 namespace.sphal.hwasan.search.paths += /odm/${LIB}
 namespace.sphal.hwasan.search.paths += /vendor/${LIB}/hwasan
@@ -231,8 +227,6 @@ namespace.sphal.hwasan.search.paths += /vendor/${LIB}/egl/hwasan
 namespace.sphal.hwasan.search.paths += /vendor/${LIB}/egl
 namespace.sphal.hwasan.search.paths += /vendor/${LIB}/hw/hwasan
 namespace.sphal.hwasan.search.paths += /vendor/${LIB}/hw
-namespace.sphal.hwasan.search.paths += /apex/com.vendor.service2/${LIB}/egl/hwasan
-namespace.sphal.hwasan.search.paths += /apex/com.vendor.service2/${LIB}/egl
 namespace.sphal.hwasan.permitted.paths = /odm/${LIB}/hwasan
 namespace.sphal.hwasan.permitted.paths += /odm/${LIB}
 namespace.sphal.hwasan.permitted.paths += /vendor/${LIB}/hwasan
@@ -241,8 +235,6 @@ namespace.sphal.hwasan.permitted.paths += /vendor/odm/${LIB}/hwasan
 namespace.sphal.hwasan.permitted.paths += /vendor/odm/${LIB}
 namespace.sphal.hwasan.permitted.paths += /system/vendor/${LIB}/hwasan
 namespace.sphal.hwasan.permitted.paths += /system/vendor/${LIB}
-namespace.sphal.hwasan.permitted.paths += /apex/com.vendor.service2/${LIB}/egl/hwasan
-namespace.sphal.hwasan.permitted.paths += /apex/com.vendor.service2/${LIB}/egl
 namespace.sphal.links = system,vndk,com_android_neuralnetworks
 namespace.sphal.link.system.shared_libs = libEGL.so:libGLESv1_CM.so:libGLESv2.so:libGLESv3.so:libRS.so:libandroid_net.so:libbinder_ndk.so:libc.so:libcgrouprc.so:libclang_rt.asan-i686-android.so:libdl.so:liblog.so:libm.so:libmediandk.so:libnativewindow.so:libsync.so:libvndksupport.so:libvulkan.so:libdl_android.so:libclang_rt.asan-arm-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so
 namespace.sphal.link.vndk.shared_libs = android.hardware.graphics.common@1.0.so:android.hardware.graphics.common@1.1.so:android.hardware.graphics.common@1.2.so:android.hardware.graphics.mapper@2.0.so:android.hardware.graphics.mapper@2.1.so:android.hardware.graphics.mapper@3.0.so:android.hardware.renderscript@1.0.so:android.hidl.memory.token@1.0.so:android.hidl.memory@1.0-impl.so:android.hidl.memory@1.0.so:android.hidl.safe_union@1.0.so:libRSCpuRef.so:libRSDriver.so:libRS_internal.so:libbase.so:libbcinfo.so:libc++.so:libcutils.so:libhardware.so:libhidlbase.so:libhidlmemory.so:libion.so:libjsoncpp.so:liblzma.so:libprocessgroup.so:libunwindstack.so:libutils.so:libutilscallstack.so:libz.so
diff --git a/testdata/golden_output/guest/com.android.sdkext/ld.config.txt b/testdata/golden_output/guest/com.android.sdkext/ld.config.txt
index 40264a0..73612ca 100644
--- a/testdata/golden_output/guest/com.android.sdkext/ld.config.txt
+++ b/testdata/golden_output/guest/com.android.sdkext/ld.config.txt
@@ -216,12 +216,10 @@ namespace.sphal.search.paths = /odm/${LIB}
 namespace.sphal.search.paths += /vendor/${LIB}
 namespace.sphal.search.paths += /vendor/${LIB}/egl
 namespace.sphal.search.paths += /vendor/${LIB}/hw
-namespace.sphal.search.paths += /apex/com.vendor.service2/${LIB}/egl
 namespace.sphal.permitted.paths = /odm/${LIB}
 namespace.sphal.permitted.paths += /vendor/${LIB}
 namespace.sphal.permitted.paths += /vendor/odm/${LIB}
 namespace.sphal.permitted.paths += /system/vendor/${LIB}
-namespace.sphal.permitted.paths += /apex/com.vendor.service2/${LIB}/egl
 namespace.sphal.asan.search.paths = /data/asan/odm/${LIB}
 namespace.sphal.asan.search.paths += /odm/${LIB}
 namespace.sphal.asan.search.paths += /data/asan/vendor/${LIB}
@@ -230,7 +228,6 @@ namespace.sphal.asan.search.paths += /data/asan/vendor/${LIB}/egl
 namespace.sphal.asan.search.paths += /vendor/${LIB}/egl
 namespace.sphal.asan.search.paths += /data/asan/vendor/${LIB}/hw
 namespace.sphal.asan.search.paths += /vendor/${LIB}/hw
-namespace.sphal.asan.search.paths += /apex/com.vendor.service2/${LIB}/egl
 namespace.sphal.asan.permitted.paths = /data/asan/odm/${LIB}
 namespace.sphal.asan.permitted.paths += /odm/${LIB}
 namespace.sphal.asan.permitted.paths += /data/asan/vendor/${LIB}
@@ -239,7 +236,6 @@ namespace.sphal.asan.permitted.paths += /data/asan/vendor/odm/${LIB}
 namespace.sphal.asan.permitted.paths += /vendor/odm/${LIB}
 namespace.sphal.asan.permitted.paths += /data/asan/system/vendor/${LIB}
 namespace.sphal.asan.permitted.paths += /system/vendor/${LIB}
-namespace.sphal.asan.permitted.paths += /apex/com.vendor.service2/${LIB}/egl
 namespace.sphal.hwasan.search.paths = /odm/${LIB}/hwasan
 namespace.sphal.hwasan.search.paths += /odm/${LIB}
 namespace.sphal.hwasan.search.paths += /vendor/${LIB}/hwasan
@@ -248,8 +244,6 @@ namespace.sphal.hwasan.search.paths += /vendor/${LIB}/egl/hwasan
 namespace.sphal.hwasan.search.paths += /vendor/${LIB}/egl
 namespace.sphal.hwasan.search.paths += /vendor/${LIB}/hw/hwasan
 namespace.sphal.hwasan.search.paths += /vendor/${LIB}/hw
-namespace.sphal.hwasan.search.paths += /apex/com.vendor.service2/${LIB}/egl/hwasan
-namespace.sphal.hwasan.search.paths += /apex/com.vendor.service2/${LIB}/egl
 namespace.sphal.hwasan.permitted.paths = /odm/${LIB}/hwasan
 namespace.sphal.hwasan.permitted.paths += /odm/${LIB}
 namespace.sphal.hwasan.permitted.paths += /vendor/${LIB}/hwasan
@@ -258,8 +252,6 @@ namespace.sphal.hwasan.permitted.paths += /vendor/odm/${LIB}/hwasan
 namespace.sphal.hwasan.permitted.paths += /vendor/odm/${LIB}
 namespace.sphal.hwasan.permitted.paths += /system/vendor/${LIB}/hwasan
 namespace.sphal.hwasan.permitted.paths += /system/vendor/${LIB}
-namespace.sphal.hwasan.permitted.paths += /apex/com.vendor.service2/${LIB}/egl/hwasan
-namespace.sphal.hwasan.permitted.paths += /apex/com.vendor.service2/${LIB}/egl
 namespace.sphal.links = system,vndk,com_android_neuralnetworks
 namespace.sphal.link.system.shared_libs = libEGL.so:libGLESv1_CM.so:libGLESv2.so:libGLESv3.so:libRS.so:libandroid_net.so:libbinder_ndk.so:libc.so:libcgrouprc.so:libclang_rt.asan-i686-android.so:libdl.so:liblog.so:libm.so:libmediandk.so:libnativewindow.so:libsync.so:libvndksupport.so:libvulkan.so:libdl_android.so:libclang_rt.asan-arm-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so
 namespace.sphal.link.vndk.shared_libs = android.hardware.graphics.common@1.0.so:android.hardware.graphics.common@1.1.so:android.hardware.graphics.common@1.2.so:android.hardware.graphics.mapper@2.0.so:android.hardware.graphics.mapper@2.1.so:android.hardware.graphics.mapper@3.0.so:android.hardware.renderscript@1.0.so:android.hidl.memory.token@1.0.so:android.hidl.memory@1.0-impl.so:android.hidl.memory@1.0.so:android.hidl.safe_union@1.0.so:libRSCpuRef.so:libRSDriver.so:libRS_internal.so:libbase.so:libbcinfo.so:libc++.so:libcutils.so:libhardware.so:libhidlbase.so:libhidlmemory.so:libion.so:libjsoncpp.so:liblzma.so:libprocessgroup.so:libunwindstack.so:libutils.so:libutilscallstack.so:libz.so
diff --git a/testdata/golden_output/guest/com.product.service1/ld.config.txt b/testdata/golden_output/guest/com.product.service1/ld.config.txt
index 4922737..4a41149 100644
--- a/testdata/golden_output/guest/com.product.service1/ld.config.txt
+++ b/testdata/golden_output/guest/com.product.service1/ld.config.txt
@@ -234,12 +234,10 @@ namespace.sphal.search.paths = /odm/${LIB}
 namespace.sphal.search.paths += /vendor/${LIB}
 namespace.sphal.search.paths += /vendor/${LIB}/egl
 namespace.sphal.search.paths += /vendor/${LIB}/hw
-namespace.sphal.search.paths += /apex/com.vendor.service2/${LIB}/egl
 namespace.sphal.permitted.paths = /odm/${LIB}
 namespace.sphal.permitted.paths += /vendor/${LIB}
 namespace.sphal.permitted.paths += /vendor/odm/${LIB}
 namespace.sphal.permitted.paths += /system/vendor/${LIB}
-namespace.sphal.permitted.paths += /apex/com.vendor.service2/${LIB}/egl
 namespace.sphal.asan.search.paths = /data/asan/odm/${LIB}
 namespace.sphal.asan.search.paths += /odm/${LIB}
 namespace.sphal.asan.search.paths += /data/asan/vendor/${LIB}
@@ -248,7 +246,6 @@ namespace.sphal.asan.search.paths += /data/asan/vendor/${LIB}/egl
 namespace.sphal.asan.search.paths += /vendor/${LIB}/egl
 namespace.sphal.asan.search.paths += /data/asan/vendor/${LIB}/hw
 namespace.sphal.asan.search.paths += /vendor/${LIB}/hw
-namespace.sphal.asan.search.paths += /apex/com.vendor.service2/${LIB}/egl
 namespace.sphal.asan.permitted.paths = /data/asan/odm/${LIB}
 namespace.sphal.asan.permitted.paths += /odm/${LIB}
 namespace.sphal.asan.permitted.paths += /data/asan/vendor/${LIB}
@@ -257,7 +254,6 @@ namespace.sphal.asan.permitted.paths += /data/asan/vendor/odm/${LIB}
 namespace.sphal.asan.permitted.paths += /vendor/odm/${LIB}
 namespace.sphal.asan.permitted.paths += /data/asan/system/vendor/${LIB}
 namespace.sphal.asan.permitted.paths += /system/vendor/${LIB}
-namespace.sphal.asan.permitted.paths += /apex/com.vendor.service2/${LIB}/egl
 namespace.sphal.hwasan.search.paths = /odm/${LIB}/hwasan
 namespace.sphal.hwasan.search.paths += /odm/${LIB}
 namespace.sphal.hwasan.search.paths += /vendor/${LIB}/hwasan
@@ -266,8 +262,6 @@ namespace.sphal.hwasan.search.paths += /vendor/${LIB}/egl/hwasan
 namespace.sphal.hwasan.search.paths += /vendor/${LIB}/egl
 namespace.sphal.hwasan.search.paths += /vendor/${LIB}/hw/hwasan
 namespace.sphal.hwasan.search.paths += /vendor/${LIB}/hw
-namespace.sphal.hwasan.search.paths += /apex/com.vendor.service2/${LIB}/egl/hwasan
-namespace.sphal.hwasan.search.paths += /apex/com.vendor.service2/${LIB}/egl
 namespace.sphal.hwasan.permitted.paths = /odm/${LIB}/hwasan
 namespace.sphal.hwasan.permitted.paths += /odm/${LIB}
 namespace.sphal.hwasan.permitted.paths += /vendor/${LIB}/hwasan
@@ -276,8 +270,6 @@ namespace.sphal.hwasan.permitted.paths += /vendor/odm/${LIB}/hwasan
 namespace.sphal.hwasan.permitted.paths += /vendor/odm/${LIB}
 namespace.sphal.hwasan.permitted.paths += /system/vendor/${LIB}/hwasan
 namespace.sphal.hwasan.permitted.paths += /system/vendor/${LIB}
-namespace.sphal.hwasan.permitted.paths += /apex/com.vendor.service2/${LIB}/egl/hwasan
-namespace.sphal.hwasan.permitted.paths += /apex/com.vendor.service2/${LIB}/egl
 namespace.sphal.links = system,vndk,com_android_neuralnetworks
 namespace.sphal.link.system.shared_libs = libEGL.so:libGLESv1_CM.so:libGLESv2.so:libGLESv3.so:libRS.so:libandroid_net.so:libbinder_ndk.so:libc.so:libcgrouprc.so:libclang_rt.asan-i686-android.so:libdl.so:liblog.so:libm.so:libmediandk.so:libnativewindow.so:libsync.so:libvndksupport.so:libvulkan.so:libdl_android.so:libclang_rt.asan-arm-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so
 namespace.sphal.link.vndk.shared_libs = android.hardware.graphics.common@1.0.so:android.hardware.graphics.common@1.1.so:android.hardware.graphics.common@1.2.so:android.hardware.graphics.mapper@2.0.so:android.hardware.graphics.mapper@2.1.so:android.hardware.graphics.mapper@3.0.so:android.hardware.renderscript@1.0.so:android.hidl.memory.token@1.0.so:android.hidl.memory@1.0-impl.so:android.hidl.memory@1.0.so:android.hidl.safe_union@1.0.so:libRSCpuRef.so:libRSDriver.so:libRS_internal.so:libbase.so:libbcinfo.so:libc++.so:libcutils.so:libhardware.so:libhidlbase.so:libhidlmemory.so:libion.so:libjsoncpp.so:liblzma.so:libprocessgroup.so:libunwindstack.so:libutils.so:libutilscallstack.so:libz.so
diff --git a/testdata/golden_output/guest/ld.config.txt b/testdata/golden_output/guest/ld.config.txt
index dc23342..3ef7572 100644
--- a/testdata/golden_output/guest/ld.config.txt
+++ b/testdata/golden_output/guest/ld.config.txt
@@ -485,12 +485,10 @@ namespace.sphal.search.paths = /odm/${LIB}
 namespace.sphal.search.paths += /vendor/${LIB}
 namespace.sphal.search.paths += /vendor/${LIB}/egl
 namespace.sphal.search.paths += /vendor/${LIB}/hw
-namespace.sphal.search.paths += /apex/com.vendor.service2/${LIB}/egl
 namespace.sphal.permitted.paths = /odm/${LIB}
 namespace.sphal.permitted.paths += /vendor/${LIB}
 namespace.sphal.permitted.paths += /vendor/odm/${LIB}
 namespace.sphal.permitted.paths += /system/vendor/${LIB}
-namespace.sphal.permitted.paths += /apex/com.vendor.service2/${LIB}/egl
 namespace.sphal.asan.search.paths = /data/asan/odm/${LIB}
 namespace.sphal.asan.search.paths += /odm/${LIB}
 namespace.sphal.asan.search.paths += /data/asan/vendor/${LIB}
@@ -499,7 +497,6 @@ namespace.sphal.asan.search.paths += /data/asan/vendor/${LIB}/egl
 namespace.sphal.asan.search.paths += /vendor/${LIB}/egl
 namespace.sphal.asan.search.paths += /data/asan/vendor/${LIB}/hw
 namespace.sphal.asan.search.paths += /vendor/${LIB}/hw
-namespace.sphal.asan.search.paths += /apex/com.vendor.service2/${LIB}/egl
 namespace.sphal.asan.permitted.paths = /data/asan/odm/${LIB}
 namespace.sphal.asan.permitted.paths += /odm/${LIB}
 namespace.sphal.asan.permitted.paths += /data/asan/vendor/${LIB}
@@ -508,7 +505,6 @@ namespace.sphal.asan.permitted.paths += /data/asan/vendor/odm/${LIB}
 namespace.sphal.asan.permitted.paths += /vendor/odm/${LIB}
 namespace.sphal.asan.permitted.paths += /data/asan/system/vendor/${LIB}
 namespace.sphal.asan.permitted.paths += /system/vendor/${LIB}
-namespace.sphal.asan.permitted.paths += /apex/com.vendor.service2/${LIB}/egl
 namespace.sphal.hwasan.search.paths = /odm/${LIB}/hwasan
 namespace.sphal.hwasan.search.paths += /odm/${LIB}
 namespace.sphal.hwasan.search.paths += /vendor/${LIB}/hwasan
@@ -517,8 +513,6 @@ namespace.sphal.hwasan.search.paths += /vendor/${LIB}/egl/hwasan
 namespace.sphal.hwasan.search.paths += /vendor/${LIB}/egl
 namespace.sphal.hwasan.search.paths += /vendor/${LIB}/hw/hwasan
 namespace.sphal.hwasan.search.paths += /vendor/${LIB}/hw
-namespace.sphal.hwasan.search.paths += /apex/com.vendor.service2/${LIB}/egl/hwasan
-namespace.sphal.hwasan.search.paths += /apex/com.vendor.service2/${LIB}/egl
 namespace.sphal.hwasan.permitted.paths = /odm/${LIB}/hwasan
 namespace.sphal.hwasan.permitted.paths += /odm/${LIB}
 namespace.sphal.hwasan.permitted.paths += /vendor/${LIB}/hwasan
@@ -527,8 +521,6 @@ namespace.sphal.hwasan.permitted.paths += /vendor/odm/${LIB}/hwasan
 namespace.sphal.hwasan.permitted.paths += /vendor/odm/${LIB}
 namespace.sphal.hwasan.permitted.paths += /system/vendor/${LIB}/hwasan
 namespace.sphal.hwasan.permitted.paths += /system/vendor/${LIB}
-namespace.sphal.hwasan.permitted.paths += /apex/com.vendor.service2/${LIB}/egl/hwasan
-namespace.sphal.hwasan.permitted.paths += /apex/com.vendor.service2/${LIB}/egl
 namespace.sphal.links = default,rs,vndk,com_android_neuralnetworks
 namespace.sphal.link.default.shared_libs = libEGL.so:libGLESv1_CM.so:libGLESv2.so:libGLESv3.so:libRS.so:libandroid_net.so:libbinder_ndk.so:libc.so:libcgrouprc.so:libclang_rt.asan-i686-android.so:libdl.so:liblog.so:libm.so:libmediandk.so:libnativewindow.so:libsync.so:libvndksupport.so:libvulkan.so:libdl_android.so:libclang_rt.asan-arm-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so
 namespace.sphal.link.rs.shared_libs = libRS_internal.so
@@ -1853,12 +1845,10 @@ namespace.sphal.search.paths = /odm/${LIB}
 namespace.sphal.search.paths += /vendor/${LIB}
 namespace.sphal.search.paths += /vendor/${LIB}/egl
 namespace.sphal.search.paths += /vendor/${LIB}/hw
-namespace.sphal.search.paths += /apex/com.vendor.service2/${LIB}/egl
 namespace.sphal.permitted.paths = /odm/${LIB}
 namespace.sphal.permitted.paths += /vendor/${LIB}
 namespace.sphal.permitted.paths += /vendor/odm/${LIB}
 namespace.sphal.permitted.paths += /system/vendor/${LIB}
-namespace.sphal.permitted.paths += /apex/com.vendor.service2/${LIB}/egl
 namespace.sphal.asan.search.paths = /data/asan/odm/${LIB}
 namespace.sphal.asan.search.paths += /odm/${LIB}
 namespace.sphal.asan.search.paths += /data/asan/vendor/${LIB}
@@ -1867,7 +1857,6 @@ namespace.sphal.asan.search.paths += /data/asan/vendor/${LIB}/egl
 namespace.sphal.asan.search.paths += /vendor/${LIB}/egl
 namespace.sphal.asan.search.paths += /data/asan/vendor/${LIB}/hw
 namespace.sphal.asan.search.paths += /vendor/${LIB}/hw
-namespace.sphal.asan.search.paths += /apex/com.vendor.service2/${LIB}/egl
 namespace.sphal.asan.permitted.paths = /data/asan/odm/${LIB}
 namespace.sphal.asan.permitted.paths += /odm/${LIB}
 namespace.sphal.asan.permitted.paths += /data/asan/vendor/${LIB}
@@ -1876,7 +1865,6 @@ namespace.sphal.asan.permitted.paths += /data/asan/vendor/odm/${LIB}
 namespace.sphal.asan.permitted.paths += /vendor/odm/${LIB}
 namespace.sphal.asan.permitted.paths += /data/asan/system/vendor/${LIB}
 namespace.sphal.asan.permitted.paths += /system/vendor/${LIB}
-namespace.sphal.asan.permitted.paths += /apex/com.vendor.service2/${LIB}/egl
 namespace.sphal.hwasan.search.paths = /odm/${LIB}/hwasan
 namespace.sphal.hwasan.search.paths += /odm/${LIB}
 namespace.sphal.hwasan.search.paths += /vendor/${LIB}/hwasan
@@ -1885,8 +1873,6 @@ namespace.sphal.hwasan.search.paths += /vendor/${LIB}/egl/hwasan
 namespace.sphal.hwasan.search.paths += /vendor/${LIB}/egl
 namespace.sphal.hwasan.search.paths += /vendor/${LIB}/hw/hwasan
 namespace.sphal.hwasan.search.paths += /vendor/${LIB}/hw
-namespace.sphal.hwasan.search.paths += /apex/com.vendor.service2/${LIB}/egl/hwasan
-namespace.sphal.hwasan.search.paths += /apex/com.vendor.service2/${LIB}/egl
 namespace.sphal.hwasan.permitted.paths = /odm/${LIB}/hwasan
 namespace.sphal.hwasan.permitted.paths += /odm/${LIB}
 namespace.sphal.hwasan.permitted.paths += /vendor/${LIB}/hwasan
@@ -1895,8 +1881,6 @@ namespace.sphal.hwasan.permitted.paths += /vendor/odm/${LIB}/hwasan
 namespace.sphal.hwasan.permitted.paths += /vendor/odm/${LIB}
 namespace.sphal.hwasan.permitted.paths += /system/vendor/${LIB}/hwasan
 namespace.sphal.hwasan.permitted.paths += /system/vendor/${LIB}
-namespace.sphal.hwasan.permitted.paths += /apex/com.vendor.service2/${LIB}/egl/hwasan
-namespace.sphal.hwasan.permitted.paths += /apex/com.vendor.service2/${LIB}/egl
 namespace.sphal.links = default,rs,vndk,com_android_neuralnetworks
 namespace.sphal.link.default.shared_libs = libEGL.so:libGLESv1_CM.so:libGLESv2.so:libGLESv3.so:libRS.so:libandroid_net.so:libbinder_ndk.so:libc.so:libcgrouprc.so:libclang_rt.asan-i686-android.so:libdl.so:liblog.so:libm.so:libmediandk.so:libnativewindow.so:libsync.so:libvndksupport.so:libvulkan.so:libdl_android.so:libclang_rt.asan-arm-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so
 namespace.sphal.link.rs.shared_libs = libRS_internal.so
diff --git a/testdata/golden_output/stage2/com.android.adbd/ld.config.txt b/testdata/golden_output/stage2/com.android.adbd/ld.config.txt
index afdceb6..0cb10ea 100644
--- a/testdata/golden_output/stage2/com.android.adbd/ld.config.txt
+++ b/testdata/golden_output/stage2/com.android.adbd/ld.config.txt
@@ -195,12 +195,10 @@ namespace.sphal.search.paths = /odm/${LIB}
 namespace.sphal.search.paths += /vendor/${LIB}
 namespace.sphal.search.paths += /vendor/${LIB}/egl
 namespace.sphal.search.paths += /vendor/${LIB}/hw
-namespace.sphal.search.paths += /apex/com.vendor.service2/${LIB}/egl
 namespace.sphal.permitted.paths = /odm/${LIB}
 namespace.sphal.permitted.paths += /vendor/${LIB}
 namespace.sphal.permitted.paths += /vendor/odm/${LIB}
 namespace.sphal.permitted.paths += /system/vendor/${LIB}
-namespace.sphal.permitted.paths += /apex/com.vendor.service2/${LIB}/egl
 namespace.sphal.asan.search.paths = /data/asan/odm/${LIB}
 namespace.sphal.asan.search.paths += /odm/${LIB}
 namespace.sphal.asan.search.paths += /data/asan/vendor/${LIB}
@@ -209,7 +207,6 @@ namespace.sphal.asan.search.paths += /data/asan/vendor/${LIB}/egl
 namespace.sphal.asan.search.paths += /vendor/${LIB}/egl
 namespace.sphal.asan.search.paths += /data/asan/vendor/${LIB}/hw
 namespace.sphal.asan.search.paths += /vendor/${LIB}/hw
-namespace.sphal.asan.search.paths += /apex/com.vendor.service2/${LIB}/egl
 namespace.sphal.asan.permitted.paths = /data/asan/odm/${LIB}
 namespace.sphal.asan.permitted.paths += /odm/${LIB}
 namespace.sphal.asan.permitted.paths += /data/asan/vendor/${LIB}
@@ -218,7 +215,6 @@ namespace.sphal.asan.permitted.paths += /data/asan/vendor/odm/${LIB}
 namespace.sphal.asan.permitted.paths += /vendor/odm/${LIB}
 namespace.sphal.asan.permitted.paths += /data/asan/system/vendor/${LIB}
 namespace.sphal.asan.permitted.paths += /system/vendor/${LIB}
-namespace.sphal.asan.permitted.paths += /apex/com.vendor.service2/${LIB}/egl
 namespace.sphal.hwasan.search.paths = /odm/${LIB}/hwasan
 namespace.sphal.hwasan.search.paths += /odm/${LIB}
 namespace.sphal.hwasan.search.paths += /vendor/${LIB}/hwasan
@@ -227,8 +223,6 @@ namespace.sphal.hwasan.search.paths += /vendor/${LIB}/egl/hwasan
 namespace.sphal.hwasan.search.paths += /vendor/${LIB}/egl
 namespace.sphal.hwasan.search.paths += /vendor/${LIB}/hw/hwasan
 namespace.sphal.hwasan.search.paths += /vendor/${LIB}/hw
-namespace.sphal.hwasan.search.paths += /apex/com.vendor.service2/${LIB}/egl/hwasan
-namespace.sphal.hwasan.search.paths += /apex/com.vendor.service2/${LIB}/egl
 namespace.sphal.hwasan.permitted.paths = /odm/${LIB}/hwasan
 namespace.sphal.hwasan.permitted.paths += /odm/${LIB}
 namespace.sphal.hwasan.permitted.paths += /vendor/${LIB}/hwasan
@@ -237,8 +231,6 @@ namespace.sphal.hwasan.permitted.paths += /vendor/odm/${LIB}/hwasan
 namespace.sphal.hwasan.permitted.paths += /vendor/odm/${LIB}
 namespace.sphal.hwasan.permitted.paths += /system/vendor/${LIB}/hwasan
 namespace.sphal.hwasan.permitted.paths += /system/vendor/${LIB}
-namespace.sphal.hwasan.permitted.paths += /apex/com.vendor.service2/${LIB}/egl/hwasan
-namespace.sphal.hwasan.permitted.paths += /apex/com.vendor.service2/${LIB}/egl
 namespace.sphal.links = system,vndk,com_android_neuralnetworks
 namespace.sphal.link.system.shared_libs = libEGL.so:libGLESv1_CM.so:libGLESv2.so:libGLESv3.so:libRS.so:libandroid_net.so:libbinder_ndk.so:libc.so:libcgrouprc.so:libclang_rt.asan-i686-android.so:libdl.so:liblog.so:libm.so:libmediandk.so:libnativewindow.so:libsync.so:libvndksupport.so:libvulkan.so:libdl_android.so:libclang_rt.asan-arm-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so
 namespace.sphal.link.vndk.shared_libs = android.hardware.graphics.common@1.0.so:android.hardware.graphics.common@1.1.so:android.hardware.graphics.common@1.2.so:android.hardware.graphics.mapper@2.0.so:android.hardware.graphics.mapper@2.1.so:android.hardware.graphics.mapper@3.0.so:android.hardware.renderscript@1.0.so:android.hidl.memory.token@1.0.so:android.hidl.memory@1.0-impl.so:android.hidl.memory@1.0.so:android.hidl.safe_union@1.0.so:libRSCpuRef.so:libRSDriver.so:libRS_internal.so:libbase.so:libbcinfo.so:libc++.so:libcutils.so:libhardware.so:libhidlbase.so:libhidlmemory.so:libion.so:libjsoncpp.so:liblzma.so:libprocessgroup.so:libunwindstack.so:libutils.so:libutilscallstack.so:libz.so
diff --git a/testdata/golden_output/stage2/com.android.art/ld.config.txt b/testdata/golden_output/stage2/com.android.art/ld.config.txt
index 22c5b51..f77f942 100644
--- a/testdata/golden_output/stage2/com.android.art/ld.config.txt
+++ b/testdata/golden_output/stage2/com.android.art/ld.config.txt
@@ -229,12 +229,10 @@ namespace.sphal.search.paths = /odm/${LIB}
 namespace.sphal.search.paths += /vendor/${LIB}
 namespace.sphal.search.paths += /vendor/${LIB}/egl
 namespace.sphal.search.paths += /vendor/${LIB}/hw
-namespace.sphal.search.paths += /apex/com.vendor.service2/${LIB}/egl
 namespace.sphal.permitted.paths = /odm/${LIB}
 namespace.sphal.permitted.paths += /vendor/${LIB}
 namespace.sphal.permitted.paths += /vendor/odm/${LIB}
 namespace.sphal.permitted.paths += /system/vendor/${LIB}
-namespace.sphal.permitted.paths += /apex/com.vendor.service2/${LIB}/egl
 namespace.sphal.asan.search.paths = /data/asan/odm/${LIB}
 namespace.sphal.asan.search.paths += /odm/${LIB}
 namespace.sphal.asan.search.paths += /data/asan/vendor/${LIB}
@@ -243,7 +241,6 @@ namespace.sphal.asan.search.paths += /data/asan/vendor/${LIB}/egl
 namespace.sphal.asan.search.paths += /vendor/${LIB}/egl
 namespace.sphal.asan.search.paths += /data/asan/vendor/${LIB}/hw
 namespace.sphal.asan.search.paths += /vendor/${LIB}/hw
-namespace.sphal.asan.search.paths += /apex/com.vendor.service2/${LIB}/egl
 namespace.sphal.asan.permitted.paths = /data/asan/odm/${LIB}
 namespace.sphal.asan.permitted.paths += /odm/${LIB}
 namespace.sphal.asan.permitted.paths += /data/asan/vendor/${LIB}
@@ -252,7 +249,6 @@ namespace.sphal.asan.permitted.paths += /data/asan/vendor/odm/${LIB}
 namespace.sphal.asan.permitted.paths += /vendor/odm/${LIB}
 namespace.sphal.asan.permitted.paths += /data/asan/system/vendor/${LIB}
 namespace.sphal.asan.permitted.paths += /system/vendor/${LIB}
-namespace.sphal.asan.permitted.paths += /apex/com.vendor.service2/${LIB}/egl
 namespace.sphal.hwasan.search.paths = /odm/${LIB}/hwasan
 namespace.sphal.hwasan.search.paths += /odm/${LIB}
 namespace.sphal.hwasan.search.paths += /vendor/${LIB}/hwasan
@@ -261,8 +257,6 @@ namespace.sphal.hwasan.search.paths += /vendor/${LIB}/egl/hwasan
 namespace.sphal.hwasan.search.paths += /vendor/${LIB}/egl
 namespace.sphal.hwasan.search.paths += /vendor/${LIB}/hw/hwasan
 namespace.sphal.hwasan.search.paths += /vendor/${LIB}/hw
-namespace.sphal.hwasan.search.paths += /apex/com.vendor.service2/${LIB}/egl/hwasan
-namespace.sphal.hwasan.search.paths += /apex/com.vendor.service2/${LIB}/egl
 namespace.sphal.hwasan.permitted.paths = /odm/${LIB}/hwasan
 namespace.sphal.hwasan.permitted.paths += /odm/${LIB}
 namespace.sphal.hwasan.permitted.paths += /vendor/${LIB}/hwasan
@@ -271,8 +265,6 @@ namespace.sphal.hwasan.permitted.paths += /vendor/odm/${LIB}/hwasan
 namespace.sphal.hwasan.permitted.paths += /vendor/odm/${LIB}
 namespace.sphal.hwasan.permitted.paths += /system/vendor/${LIB}/hwasan
 namespace.sphal.hwasan.permitted.paths += /system/vendor/${LIB}
-namespace.sphal.hwasan.permitted.paths += /apex/com.vendor.service2/${LIB}/egl/hwasan
-namespace.sphal.hwasan.permitted.paths += /apex/com.vendor.service2/${LIB}/egl
 namespace.sphal.links = system,vndk,com_android_neuralnetworks
 namespace.sphal.link.system.shared_libs = libEGL.so:libGLESv1_CM.so:libGLESv2.so:libGLESv3.so:libRS.so:libandroid_net.so:libbinder_ndk.so:libc.so:libcgrouprc.so:libclang_rt.asan-i686-android.so:libdl.so:liblog.so:libm.so:libmediandk.so:libnativewindow.so:libsync.so:libvndksupport.so:libvulkan.so:libdl_android.so:libclang_rt.asan-arm-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so
 namespace.sphal.link.vndk.shared_libs = android.hardware.graphics.common@1.0.so:android.hardware.graphics.common@1.1.so:android.hardware.graphics.common@1.2.so:android.hardware.graphics.mapper@2.0.so:android.hardware.graphics.mapper@2.1.so:android.hardware.graphics.mapper@3.0.so:android.hardware.renderscript@1.0.so:android.hidl.memory.token@1.0.so:android.hidl.memory@1.0-impl.so:android.hidl.memory@1.0.so:android.hidl.safe_union@1.0.so:libRSCpuRef.so:libRSDriver.so:libRS_internal.so:libbase.so:libbcinfo.so:libc++.so:libcutils.so:libhardware.so:libhidlbase.so:libhidlmemory.so:libion.so:libjsoncpp.so:liblzma.so:libprocessgroup.so:libunwindstack.so:libutils.so:libutilscallstack.so:libz.so
diff --git a/testdata/golden_output/stage2/com.android.conscrypt/ld.config.txt b/testdata/golden_output/stage2/com.android.conscrypt/ld.config.txt
index d2c1917..1dcea6e 100644
--- a/testdata/golden_output/stage2/com.android.conscrypt/ld.config.txt
+++ b/testdata/golden_output/stage2/com.android.conscrypt/ld.config.txt
@@ -217,12 +217,10 @@ namespace.sphal.search.paths = /odm/${LIB}
 namespace.sphal.search.paths += /vendor/${LIB}
 namespace.sphal.search.paths += /vendor/${LIB}/egl
 namespace.sphal.search.paths += /vendor/${LIB}/hw
-namespace.sphal.search.paths += /apex/com.vendor.service2/${LIB}/egl
 namespace.sphal.permitted.paths = /odm/${LIB}
 namespace.sphal.permitted.paths += /vendor/${LIB}
 namespace.sphal.permitted.paths += /vendor/odm/${LIB}
 namespace.sphal.permitted.paths += /system/vendor/${LIB}
-namespace.sphal.permitted.paths += /apex/com.vendor.service2/${LIB}/egl
 namespace.sphal.asan.search.paths = /data/asan/odm/${LIB}
 namespace.sphal.asan.search.paths += /odm/${LIB}
 namespace.sphal.asan.search.paths += /data/asan/vendor/${LIB}
@@ -231,7 +229,6 @@ namespace.sphal.asan.search.paths += /data/asan/vendor/${LIB}/egl
 namespace.sphal.asan.search.paths += /vendor/${LIB}/egl
 namespace.sphal.asan.search.paths += /data/asan/vendor/${LIB}/hw
 namespace.sphal.asan.search.paths += /vendor/${LIB}/hw
-namespace.sphal.asan.search.paths += /apex/com.vendor.service2/${LIB}/egl
 namespace.sphal.asan.permitted.paths = /data/asan/odm/${LIB}
 namespace.sphal.asan.permitted.paths += /odm/${LIB}
 namespace.sphal.asan.permitted.paths += /data/asan/vendor/${LIB}
@@ -240,7 +237,6 @@ namespace.sphal.asan.permitted.paths += /data/asan/vendor/odm/${LIB}
 namespace.sphal.asan.permitted.paths += /vendor/odm/${LIB}
 namespace.sphal.asan.permitted.paths += /data/asan/system/vendor/${LIB}
 namespace.sphal.asan.permitted.paths += /system/vendor/${LIB}
-namespace.sphal.asan.permitted.paths += /apex/com.vendor.service2/${LIB}/egl
 namespace.sphal.hwasan.search.paths = /odm/${LIB}/hwasan
 namespace.sphal.hwasan.search.paths += /odm/${LIB}
 namespace.sphal.hwasan.search.paths += /vendor/${LIB}/hwasan
@@ -249,8 +245,6 @@ namespace.sphal.hwasan.search.paths += /vendor/${LIB}/egl/hwasan
 namespace.sphal.hwasan.search.paths += /vendor/${LIB}/egl
 namespace.sphal.hwasan.search.paths += /vendor/${LIB}/hw/hwasan
 namespace.sphal.hwasan.search.paths += /vendor/${LIB}/hw
-namespace.sphal.hwasan.search.paths += /apex/com.vendor.service2/${LIB}/egl/hwasan
-namespace.sphal.hwasan.search.paths += /apex/com.vendor.service2/${LIB}/egl
 namespace.sphal.hwasan.permitted.paths = /odm/${LIB}/hwasan
 namespace.sphal.hwasan.permitted.paths += /odm/${LIB}
 namespace.sphal.hwasan.permitted.paths += /vendor/${LIB}/hwasan
@@ -259,8 +253,6 @@ namespace.sphal.hwasan.permitted.paths += /vendor/odm/${LIB}/hwasan
 namespace.sphal.hwasan.permitted.paths += /vendor/odm/${LIB}
 namespace.sphal.hwasan.permitted.paths += /system/vendor/${LIB}/hwasan
 namespace.sphal.hwasan.permitted.paths += /system/vendor/${LIB}
-namespace.sphal.hwasan.permitted.paths += /apex/com.vendor.service2/${LIB}/egl/hwasan
-namespace.sphal.hwasan.permitted.paths += /apex/com.vendor.service2/${LIB}/egl
 namespace.sphal.links = system,vndk,com_android_neuralnetworks
 namespace.sphal.link.system.shared_libs = libEGL.so:libGLESv1_CM.so:libGLESv2.so:libGLESv3.so:libRS.so:libandroid_net.so:libbinder_ndk.so:libc.so:libcgrouprc.so:libclang_rt.asan-i686-android.so:libdl.so:liblog.so:libm.so:libmediandk.so:libnativewindow.so:libsync.so:libvndksupport.so:libvulkan.so:libdl_android.so:libclang_rt.asan-arm-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so
 namespace.sphal.link.vndk.shared_libs = android.hardware.graphics.common@1.0.so:android.hardware.graphics.common@1.1.so:android.hardware.graphics.common@1.2.so:android.hardware.graphics.mapper@2.0.so:android.hardware.graphics.mapper@2.1.so:android.hardware.graphics.mapper@3.0.so:android.hardware.renderscript@1.0.so:android.hidl.memory.token@1.0.so:android.hidl.memory@1.0-impl.so:android.hidl.memory@1.0.so:android.hidl.safe_union@1.0.so:libRSCpuRef.so:libRSDriver.so:libRS_internal.so:libbase.so:libbcinfo.so:libc++.so:libcutils.so:libhardware.so:libhidlbase.so:libhidlmemory.so:libion.so:libjsoncpp.so:liblzma.so:libprocessgroup.so:libunwindstack.so:libutils.so:libutilscallstack.so:libz.so
diff --git a/testdata/golden_output/stage2/com.android.media.swcodec/ld.config.txt b/testdata/golden_output/stage2/com.android.media.swcodec/ld.config.txt
index 72fd31f..ad917a9 100644
--- a/testdata/golden_output/stage2/com.android.media.swcodec/ld.config.txt
+++ b/testdata/golden_output/stage2/com.android.media.swcodec/ld.config.txt
@@ -216,12 +216,10 @@ namespace.sphal.search.paths = /odm/${LIB}
 namespace.sphal.search.paths += /vendor/${LIB}
 namespace.sphal.search.paths += /vendor/${LIB}/egl
 namespace.sphal.search.paths += /vendor/${LIB}/hw
-namespace.sphal.search.paths += /apex/com.vendor.service2/${LIB}/egl
 namespace.sphal.permitted.paths = /odm/${LIB}
 namespace.sphal.permitted.paths += /vendor/${LIB}
 namespace.sphal.permitted.paths += /vendor/odm/${LIB}
 namespace.sphal.permitted.paths += /system/vendor/${LIB}
-namespace.sphal.permitted.paths += /apex/com.vendor.service2/${LIB}/egl
 namespace.sphal.asan.search.paths = /data/asan/odm/${LIB}
 namespace.sphal.asan.search.paths += /odm/${LIB}
 namespace.sphal.asan.search.paths += /data/asan/vendor/${LIB}
@@ -230,7 +228,6 @@ namespace.sphal.asan.search.paths += /data/asan/vendor/${LIB}/egl
 namespace.sphal.asan.search.paths += /vendor/${LIB}/egl
 namespace.sphal.asan.search.paths += /data/asan/vendor/${LIB}/hw
 namespace.sphal.asan.search.paths += /vendor/${LIB}/hw
-namespace.sphal.asan.search.paths += /apex/com.vendor.service2/${LIB}/egl
 namespace.sphal.asan.permitted.paths = /data/asan/odm/${LIB}
 namespace.sphal.asan.permitted.paths += /odm/${LIB}
 namespace.sphal.asan.permitted.paths += /data/asan/vendor/${LIB}
@@ -239,7 +236,6 @@ namespace.sphal.asan.permitted.paths += /data/asan/vendor/odm/${LIB}
 namespace.sphal.asan.permitted.paths += /vendor/odm/${LIB}
 namespace.sphal.asan.permitted.paths += /data/asan/system/vendor/${LIB}
 namespace.sphal.asan.permitted.paths += /system/vendor/${LIB}
-namespace.sphal.asan.permitted.paths += /apex/com.vendor.service2/${LIB}/egl
 namespace.sphal.hwasan.search.paths = /odm/${LIB}/hwasan
 namespace.sphal.hwasan.search.paths += /odm/${LIB}
 namespace.sphal.hwasan.search.paths += /vendor/${LIB}/hwasan
@@ -248,8 +244,6 @@ namespace.sphal.hwasan.search.paths += /vendor/${LIB}/egl/hwasan
 namespace.sphal.hwasan.search.paths += /vendor/${LIB}/egl
 namespace.sphal.hwasan.search.paths += /vendor/${LIB}/hw/hwasan
 namespace.sphal.hwasan.search.paths += /vendor/${LIB}/hw
-namespace.sphal.hwasan.search.paths += /apex/com.vendor.service2/${LIB}/egl/hwasan
-namespace.sphal.hwasan.search.paths += /apex/com.vendor.service2/${LIB}/egl
 namespace.sphal.hwasan.permitted.paths = /odm/${LIB}/hwasan
 namespace.sphal.hwasan.permitted.paths += /odm/${LIB}
 namespace.sphal.hwasan.permitted.paths += /vendor/${LIB}/hwasan
@@ -258,8 +252,6 @@ namespace.sphal.hwasan.permitted.paths += /vendor/odm/${LIB}/hwasan
 namespace.sphal.hwasan.permitted.paths += /vendor/odm/${LIB}
 namespace.sphal.hwasan.permitted.paths += /system/vendor/${LIB}/hwasan
 namespace.sphal.hwasan.permitted.paths += /system/vendor/${LIB}
-namespace.sphal.hwasan.permitted.paths += /apex/com.vendor.service2/${LIB}/egl/hwasan
-namespace.sphal.hwasan.permitted.paths += /apex/com.vendor.service2/${LIB}/egl
 namespace.sphal.links = system,vndk,com_android_neuralnetworks
 namespace.sphal.link.system.shared_libs = libEGL.so:libGLESv1_CM.so:libGLESv2.so:libGLESv3.so:libRS.so:libandroid_net.so:libbinder_ndk.so:libc.so:libcgrouprc.so:libclang_rt.asan-i686-android.so:libdl.so:liblog.so:libm.so:libmediandk.so:libnativewindow.so:libsync.so:libvndksupport.so:libvulkan.so:libdl_android.so:libclang_rt.asan-arm-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so
 namespace.sphal.link.vndk.shared_libs = android.hardware.graphics.common@1.0.so:android.hardware.graphics.common@1.1.so:android.hardware.graphics.common@1.2.so:android.hardware.graphics.mapper@2.0.so:android.hardware.graphics.mapper@2.1.so:android.hardware.graphics.mapper@3.0.so:android.hardware.renderscript@1.0.so:android.hidl.memory.token@1.0.so:android.hidl.memory@1.0-impl.so:android.hidl.memory@1.0.so:android.hidl.safe_union@1.0.so:libRSCpuRef.so:libRSDriver.so:libRS_internal.so:libbase.so:libbcinfo.so:libc++.so:libcutils.so:libhardware.so:libhidlbase.so:libhidlmemory.so:libion.so:libjsoncpp.so:liblzma.so:libprocessgroup.so:libunwindstack.so:libutils.so:libutilscallstack.so:libz.so
diff --git a/testdata/golden_output/stage2/com.android.runtime/ld.config.txt b/testdata/golden_output/stage2/com.android.runtime/ld.config.txt
index b7ccf80..c5a9dd0 100644
--- a/testdata/golden_output/stage2/com.android.runtime/ld.config.txt
+++ b/testdata/golden_output/stage2/com.android.runtime/ld.config.txt
@@ -199,12 +199,10 @@ namespace.sphal.search.paths = /odm/${LIB}
 namespace.sphal.search.paths += /vendor/${LIB}
 namespace.sphal.search.paths += /vendor/${LIB}/egl
 namespace.sphal.search.paths += /vendor/${LIB}/hw
-namespace.sphal.search.paths += /apex/com.vendor.service2/${LIB}/egl
 namespace.sphal.permitted.paths = /odm/${LIB}
 namespace.sphal.permitted.paths += /vendor/${LIB}
 namespace.sphal.permitted.paths += /vendor/odm/${LIB}
 namespace.sphal.permitted.paths += /system/vendor/${LIB}
-namespace.sphal.permitted.paths += /apex/com.vendor.service2/${LIB}/egl
 namespace.sphal.asan.search.paths = /data/asan/odm/${LIB}
 namespace.sphal.asan.search.paths += /odm/${LIB}
 namespace.sphal.asan.search.paths += /data/asan/vendor/${LIB}
@@ -213,7 +211,6 @@ namespace.sphal.asan.search.paths += /data/asan/vendor/${LIB}/egl
 namespace.sphal.asan.search.paths += /vendor/${LIB}/egl
 namespace.sphal.asan.search.paths += /data/asan/vendor/${LIB}/hw
 namespace.sphal.asan.search.paths += /vendor/${LIB}/hw
-namespace.sphal.asan.search.paths += /apex/com.vendor.service2/${LIB}/egl
 namespace.sphal.asan.permitted.paths = /data/asan/odm/${LIB}
 namespace.sphal.asan.permitted.paths += /odm/${LIB}
 namespace.sphal.asan.permitted.paths += /data/asan/vendor/${LIB}
@@ -222,7 +219,6 @@ namespace.sphal.asan.permitted.paths += /data/asan/vendor/odm/${LIB}
 namespace.sphal.asan.permitted.paths += /vendor/odm/${LIB}
 namespace.sphal.asan.permitted.paths += /data/asan/system/vendor/${LIB}
 namespace.sphal.asan.permitted.paths += /system/vendor/${LIB}
-namespace.sphal.asan.permitted.paths += /apex/com.vendor.service2/${LIB}/egl
 namespace.sphal.hwasan.search.paths = /odm/${LIB}/hwasan
 namespace.sphal.hwasan.search.paths += /odm/${LIB}
 namespace.sphal.hwasan.search.paths += /vendor/${LIB}/hwasan
@@ -231,8 +227,6 @@ namespace.sphal.hwasan.search.paths += /vendor/${LIB}/egl/hwasan
 namespace.sphal.hwasan.search.paths += /vendor/${LIB}/egl
 namespace.sphal.hwasan.search.paths += /vendor/${LIB}/hw/hwasan
 namespace.sphal.hwasan.search.paths += /vendor/${LIB}/hw
-namespace.sphal.hwasan.search.paths += /apex/com.vendor.service2/${LIB}/egl/hwasan
-namespace.sphal.hwasan.search.paths += /apex/com.vendor.service2/${LIB}/egl
 namespace.sphal.hwasan.permitted.paths = /odm/${LIB}/hwasan
 namespace.sphal.hwasan.permitted.paths += /odm/${LIB}
 namespace.sphal.hwasan.permitted.paths += /vendor/${LIB}/hwasan
@@ -241,8 +235,6 @@ namespace.sphal.hwasan.permitted.paths += /vendor/odm/${LIB}/hwasan
 namespace.sphal.hwasan.permitted.paths += /vendor/odm/${LIB}
 namespace.sphal.hwasan.permitted.paths += /system/vendor/${LIB}/hwasan
 namespace.sphal.hwasan.permitted.paths += /system/vendor/${LIB}
-namespace.sphal.hwasan.permitted.paths += /apex/com.vendor.service2/${LIB}/egl/hwasan
-namespace.sphal.hwasan.permitted.paths += /apex/com.vendor.service2/${LIB}/egl
 namespace.sphal.links = system,vndk,com_android_neuralnetworks
 namespace.sphal.link.system.shared_libs = libEGL.so:libGLESv1_CM.so:libGLESv2.so:libGLESv3.so:libRS.so:libandroid_net.so:libbinder_ndk.so:libc.so:libcgrouprc.so:libclang_rt.asan-i686-android.so:libdl.so:liblog.so:libm.so:libmediandk.so:libnativewindow.so:libsync.so:libvndksupport.so:libvulkan.so:libdl_android.so:libclang_rt.asan-arm-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so
 namespace.sphal.link.vndk.shared_libs = android.hardware.graphics.common@1.0.so:android.hardware.graphics.common@1.1.so:android.hardware.graphics.common@1.2.so:android.hardware.graphics.mapper@2.0.so:android.hardware.graphics.mapper@2.1.so:android.hardware.graphics.mapper@3.0.so:android.hardware.renderscript@1.0.so:android.hidl.memory.token@1.0.so:android.hidl.memory@1.0-impl.so:android.hidl.memory@1.0.so:android.hidl.safe_union@1.0.so:libRSCpuRef.so:libRSDriver.so:libRS_internal.so:libbase.so:libbcinfo.so:libc++.so:libcutils.so:libhardware.so:libhidlbase.so:libhidlmemory.so:libion.so:libjsoncpp.so:liblzma.so:libprocessgroup.so:libunwindstack.so:libutils.so:libutilscallstack.so:libz.so
diff --git a/testdata/golden_output/stage2/com.android.sdkext/ld.config.txt b/testdata/golden_output/stage2/com.android.sdkext/ld.config.txt
index 40264a0..73612ca 100644
--- a/testdata/golden_output/stage2/com.android.sdkext/ld.config.txt
+++ b/testdata/golden_output/stage2/com.android.sdkext/ld.config.txt
@@ -216,12 +216,10 @@ namespace.sphal.search.paths = /odm/${LIB}
 namespace.sphal.search.paths += /vendor/${LIB}
 namespace.sphal.search.paths += /vendor/${LIB}/egl
 namespace.sphal.search.paths += /vendor/${LIB}/hw
-namespace.sphal.search.paths += /apex/com.vendor.service2/${LIB}/egl
 namespace.sphal.permitted.paths = /odm/${LIB}
 namespace.sphal.permitted.paths += /vendor/${LIB}
 namespace.sphal.permitted.paths += /vendor/odm/${LIB}
 namespace.sphal.permitted.paths += /system/vendor/${LIB}
-namespace.sphal.permitted.paths += /apex/com.vendor.service2/${LIB}/egl
 namespace.sphal.asan.search.paths = /data/asan/odm/${LIB}
 namespace.sphal.asan.search.paths += /odm/${LIB}
 namespace.sphal.asan.search.paths += /data/asan/vendor/${LIB}
@@ -230,7 +228,6 @@ namespace.sphal.asan.search.paths += /data/asan/vendor/${LIB}/egl
 namespace.sphal.asan.search.paths += /vendor/${LIB}/egl
 namespace.sphal.asan.search.paths += /data/asan/vendor/${LIB}/hw
 namespace.sphal.asan.search.paths += /vendor/${LIB}/hw
-namespace.sphal.asan.search.paths += /apex/com.vendor.service2/${LIB}/egl
 namespace.sphal.asan.permitted.paths = /data/asan/odm/${LIB}
 namespace.sphal.asan.permitted.paths += /odm/${LIB}
 namespace.sphal.asan.permitted.paths += /data/asan/vendor/${LIB}
@@ -239,7 +236,6 @@ namespace.sphal.asan.permitted.paths += /data/asan/vendor/odm/${LIB}
 namespace.sphal.asan.permitted.paths += /vendor/odm/${LIB}
 namespace.sphal.asan.permitted.paths += /data/asan/system/vendor/${LIB}
 namespace.sphal.asan.permitted.paths += /system/vendor/${LIB}
-namespace.sphal.asan.permitted.paths += /apex/com.vendor.service2/${LIB}/egl
 namespace.sphal.hwasan.search.paths = /odm/${LIB}/hwasan
 namespace.sphal.hwasan.search.paths += /odm/${LIB}
 namespace.sphal.hwasan.search.paths += /vendor/${LIB}/hwasan
@@ -248,8 +244,6 @@ namespace.sphal.hwasan.search.paths += /vendor/${LIB}/egl/hwasan
 namespace.sphal.hwasan.search.paths += /vendor/${LIB}/egl
 namespace.sphal.hwasan.search.paths += /vendor/${LIB}/hw/hwasan
 namespace.sphal.hwasan.search.paths += /vendor/${LIB}/hw
-namespace.sphal.hwasan.search.paths += /apex/com.vendor.service2/${LIB}/egl/hwasan
-namespace.sphal.hwasan.search.paths += /apex/com.vendor.service2/${LIB}/egl
 namespace.sphal.hwasan.permitted.paths = /odm/${LIB}/hwasan
 namespace.sphal.hwasan.permitted.paths += /odm/${LIB}
 namespace.sphal.hwasan.permitted.paths += /vendor/${LIB}/hwasan
@@ -258,8 +252,6 @@ namespace.sphal.hwasan.permitted.paths += /vendor/odm/${LIB}/hwasan
 namespace.sphal.hwasan.permitted.paths += /vendor/odm/${LIB}
 namespace.sphal.hwasan.permitted.paths += /system/vendor/${LIB}/hwasan
 namespace.sphal.hwasan.permitted.paths += /system/vendor/${LIB}
-namespace.sphal.hwasan.permitted.paths += /apex/com.vendor.service2/${LIB}/egl/hwasan
-namespace.sphal.hwasan.permitted.paths += /apex/com.vendor.service2/${LIB}/egl
 namespace.sphal.links = system,vndk,com_android_neuralnetworks
 namespace.sphal.link.system.shared_libs = libEGL.so:libGLESv1_CM.so:libGLESv2.so:libGLESv3.so:libRS.so:libandroid_net.so:libbinder_ndk.so:libc.so:libcgrouprc.so:libclang_rt.asan-i686-android.so:libdl.so:liblog.so:libm.so:libmediandk.so:libnativewindow.so:libsync.so:libvndksupport.so:libvulkan.so:libdl_android.so:libclang_rt.asan-arm-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so
 namespace.sphal.link.vndk.shared_libs = android.hardware.graphics.common@1.0.so:android.hardware.graphics.common@1.1.so:android.hardware.graphics.common@1.2.so:android.hardware.graphics.mapper@2.0.so:android.hardware.graphics.mapper@2.1.so:android.hardware.graphics.mapper@3.0.so:android.hardware.renderscript@1.0.so:android.hidl.memory.token@1.0.so:android.hidl.memory@1.0-impl.so:android.hidl.memory@1.0.so:android.hidl.safe_union@1.0.so:libRSCpuRef.so:libRSDriver.so:libRS_internal.so:libbase.so:libbcinfo.so:libc++.so:libcutils.so:libhardware.so:libhidlbase.so:libhidlmemory.so:libion.so:libjsoncpp.so:liblzma.so:libprocessgroup.so:libunwindstack.so:libutils.so:libutilscallstack.so:libz.so
diff --git a/testdata/golden_output/stage2/com.product.service1/ld.config.txt b/testdata/golden_output/stage2/com.product.service1/ld.config.txt
index 4922737..4a41149 100644
--- a/testdata/golden_output/stage2/com.product.service1/ld.config.txt
+++ b/testdata/golden_output/stage2/com.product.service1/ld.config.txt
@@ -234,12 +234,10 @@ namespace.sphal.search.paths = /odm/${LIB}
 namespace.sphal.search.paths += /vendor/${LIB}
 namespace.sphal.search.paths += /vendor/${LIB}/egl
 namespace.sphal.search.paths += /vendor/${LIB}/hw
-namespace.sphal.search.paths += /apex/com.vendor.service2/${LIB}/egl
 namespace.sphal.permitted.paths = /odm/${LIB}
 namespace.sphal.permitted.paths += /vendor/${LIB}
 namespace.sphal.permitted.paths += /vendor/odm/${LIB}
 namespace.sphal.permitted.paths += /system/vendor/${LIB}
-namespace.sphal.permitted.paths += /apex/com.vendor.service2/${LIB}/egl
 namespace.sphal.asan.search.paths = /data/asan/odm/${LIB}
 namespace.sphal.asan.search.paths += /odm/${LIB}
 namespace.sphal.asan.search.paths += /data/asan/vendor/${LIB}
@@ -248,7 +246,6 @@ namespace.sphal.asan.search.paths += /data/asan/vendor/${LIB}/egl
 namespace.sphal.asan.search.paths += /vendor/${LIB}/egl
 namespace.sphal.asan.search.paths += /data/asan/vendor/${LIB}/hw
 namespace.sphal.asan.search.paths += /vendor/${LIB}/hw
-namespace.sphal.asan.search.paths += /apex/com.vendor.service2/${LIB}/egl
 namespace.sphal.asan.permitted.paths = /data/asan/odm/${LIB}
 namespace.sphal.asan.permitted.paths += /odm/${LIB}
 namespace.sphal.asan.permitted.paths += /data/asan/vendor/${LIB}
@@ -257,7 +254,6 @@ namespace.sphal.asan.permitted.paths += /data/asan/vendor/odm/${LIB}
 namespace.sphal.asan.permitted.paths += /vendor/odm/${LIB}
 namespace.sphal.asan.permitted.paths += /data/asan/system/vendor/${LIB}
 namespace.sphal.asan.permitted.paths += /system/vendor/${LIB}
-namespace.sphal.asan.permitted.paths += /apex/com.vendor.service2/${LIB}/egl
 namespace.sphal.hwasan.search.paths = /odm/${LIB}/hwasan
 namespace.sphal.hwasan.search.paths += /odm/${LIB}
 namespace.sphal.hwasan.search.paths += /vendor/${LIB}/hwasan
@@ -266,8 +262,6 @@ namespace.sphal.hwasan.search.paths += /vendor/${LIB}/egl/hwasan
 namespace.sphal.hwasan.search.paths += /vendor/${LIB}/egl
 namespace.sphal.hwasan.search.paths += /vendor/${LIB}/hw/hwasan
 namespace.sphal.hwasan.search.paths += /vendor/${LIB}/hw
-namespace.sphal.hwasan.search.paths += /apex/com.vendor.service2/${LIB}/egl/hwasan
-namespace.sphal.hwasan.search.paths += /apex/com.vendor.service2/${LIB}/egl
 namespace.sphal.hwasan.permitted.paths = /odm/${LIB}/hwasan
 namespace.sphal.hwasan.permitted.paths += /odm/${LIB}
 namespace.sphal.hwasan.permitted.paths += /vendor/${LIB}/hwasan
@@ -276,8 +270,6 @@ namespace.sphal.hwasan.permitted.paths += /vendor/odm/${LIB}/hwasan
 namespace.sphal.hwasan.permitted.paths += /vendor/odm/${LIB}
 namespace.sphal.hwasan.permitted.paths += /system/vendor/${LIB}/hwasan
 namespace.sphal.hwasan.permitted.paths += /system/vendor/${LIB}
-namespace.sphal.hwasan.permitted.paths += /apex/com.vendor.service2/${LIB}/egl/hwasan
-namespace.sphal.hwasan.permitted.paths += /apex/com.vendor.service2/${LIB}/egl
 namespace.sphal.links = system,vndk,com_android_neuralnetworks
 namespace.sphal.link.system.shared_libs = libEGL.so:libGLESv1_CM.so:libGLESv2.so:libGLESv3.so:libRS.so:libandroid_net.so:libbinder_ndk.so:libc.so:libcgrouprc.so:libclang_rt.asan-i686-android.so:libdl.so:liblog.so:libm.so:libmediandk.so:libnativewindow.so:libsync.so:libvndksupport.so:libvulkan.so:libdl_android.so:libclang_rt.asan-arm-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so
 namespace.sphal.link.vndk.shared_libs = android.hardware.graphics.common@1.0.so:android.hardware.graphics.common@1.1.so:android.hardware.graphics.common@1.2.so:android.hardware.graphics.mapper@2.0.so:android.hardware.graphics.mapper@2.1.so:android.hardware.graphics.mapper@3.0.so:android.hardware.renderscript@1.0.so:android.hidl.memory.token@1.0.so:android.hidl.memory@1.0-impl.so:android.hidl.memory@1.0.so:android.hidl.safe_union@1.0.so:libRSCpuRef.so:libRSDriver.so:libRS_internal.so:libbase.so:libbcinfo.so:libc++.so:libcutils.so:libhardware.so:libhidlbase.so:libhidlmemory.so:libion.so:libjsoncpp.so:liblzma.so:libprocessgroup.so:libunwindstack.so:libutils.so:libutilscallstack.so:libz.so
diff --git a/testdata/golden_output/stage2/ld.config.txt b/testdata/golden_output/stage2/ld.config.txt
index dc23342..3ef7572 100644
--- a/testdata/golden_output/stage2/ld.config.txt
+++ b/testdata/golden_output/stage2/ld.config.txt
@@ -485,12 +485,10 @@ namespace.sphal.search.paths = /odm/${LIB}
 namespace.sphal.search.paths += /vendor/${LIB}
 namespace.sphal.search.paths += /vendor/${LIB}/egl
 namespace.sphal.search.paths += /vendor/${LIB}/hw
-namespace.sphal.search.paths += /apex/com.vendor.service2/${LIB}/egl
 namespace.sphal.permitted.paths = /odm/${LIB}
 namespace.sphal.permitted.paths += /vendor/${LIB}
 namespace.sphal.permitted.paths += /vendor/odm/${LIB}
 namespace.sphal.permitted.paths += /system/vendor/${LIB}
-namespace.sphal.permitted.paths += /apex/com.vendor.service2/${LIB}/egl
 namespace.sphal.asan.search.paths = /data/asan/odm/${LIB}
 namespace.sphal.asan.search.paths += /odm/${LIB}
 namespace.sphal.asan.search.paths += /data/asan/vendor/${LIB}
@@ -499,7 +497,6 @@ namespace.sphal.asan.search.paths += /data/asan/vendor/${LIB}/egl
 namespace.sphal.asan.search.paths += /vendor/${LIB}/egl
 namespace.sphal.asan.search.paths += /data/asan/vendor/${LIB}/hw
 namespace.sphal.asan.search.paths += /vendor/${LIB}/hw
-namespace.sphal.asan.search.paths += /apex/com.vendor.service2/${LIB}/egl
 namespace.sphal.asan.permitted.paths = /data/asan/odm/${LIB}
 namespace.sphal.asan.permitted.paths += /odm/${LIB}
 namespace.sphal.asan.permitted.paths += /data/asan/vendor/${LIB}
@@ -508,7 +505,6 @@ namespace.sphal.asan.permitted.paths += /data/asan/vendor/odm/${LIB}
 namespace.sphal.asan.permitted.paths += /vendor/odm/${LIB}
 namespace.sphal.asan.permitted.paths += /data/asan/system/vendor/${LIB}
 namespace.sphal.asan.permitted.paths += /system/vendor/${LIB}
-namespace.sphal.asan.permitted.paths += /apex/com.vendor.service2/${LIB}/egl
 namespace.sphal.hwasan.search.paths = /odm/${LIB}/hwasan
 namespace.sphal.hwasan.search.paths += /odm/${LIB}
 namespace.sphal.hwasan.search.paths += /vendor/${LIB}/hwasan
@@ -517,8 +513,6 @@ namespace.sphal.hwasan.search.paths += /vendor/${LIB}/egl/hwasan
 namespace.sphal.hwasan.search.paths += /vendor/${LIB}/egl
 namespace.sphal.hwasan.search.paths += /vendor/${LIB}/hw/hwasan
 namespace.sphal.hwasan.search.paths += /vendor/${LIB}/hw
-namespace.sphal.hwasan.search.paths += /apex/com.vendor.service2/${LIB}/egl/hwasan
-namespace.sphal.hwasan.search.paths += /apex/com.vendor.service2/${LIB}/egl
 namespace.sphal.hwasan.permitted.paths = /odm/${LIB}/hwasan
 namespace.sphal.hwasan.permitted.paths += /odm/${LIB}
 namespace.sphal.hwasan.permitted.paths += /vendor/${LIB}/hwasan
@@ -527,8 +521,6 @@ namespace.sphal.hwasan.permitted.paths += /vendor/odm/${LIB}/hwasan
 namespace.sphal.hwasan.permitted.paths += /vendor/odm/${LIB}
 namespace.sphal.hwasan.permitted.paths += /system/vendor/${LIB}/hwasan
 namespace.sphal.hwasan.permitted.paths += /system/vendor/${LIB}
-namespace.sphal.hwasan.permitted.paths += /apex/com.vendor.service2/${LIB}/egl/hwasan
-namespace.sphal.hwasan.permitted.paths += /apex/com.vendor.service2/${LIB}/egl
 namespace.sphal.links = default,rs,vndk,com_android_neuralnetworks
 namespace.sphal.link.default.shared_libs = libEGL.so:libGLESv1_CM.so:libGLESv2.so:libGLESv3.so:libRS.so:libandroid_net.so:libbinder_ndk.so:libc.so:libcgrouprc.so:libclang_rt.asan-i686-android.so:libdl.so:liblog.so:libm.so:libmediandk.so:libnativewindow.so:libsync.so:libvndksupport.so:libvulkan.so:libdl_android.so:libclang_rt.asan-arm-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so
 namespace.sphal.link.rs.shared_libs = libRS_internal.so
@@ -1853,12 +1845,10 @@ namespace.sphal.search.paths = /odm/${LIB}
 namespace.sphal.search.paths += /vendor/${LIB}
 namespace.sphal.search.paths += /vendor/${LIB}/egl
 namespace.sphal.search.paths += /vendor/${LIB}/hw
-namespace.sphal.search.paths += /apex/com.vendor.service2/${LIB}/egl
 namespace.sphal.permitted.paths = /odm/${LIB}
 namespace.sphal.permitted.paths += /vendor/${LIB}
 namespace.sphal.permitted.paths += /vendor/odm/${LIB}
 namespace.sphal.permitted.paths += /system/vendor/${LIB}
-namespace.sphal.permitted.paths += /apex/com.vendor.service2/${LIB}/egl
 namespace.sphal.asan.search.paths = /data/asan/odm/${LIB}
 namespace.sphal.asan.search.paths += /odm/${LIB}
 namespace.sphal.asan.search.paths += /data/asan/vendor/${LIB}
@@ -1867,7 +1857,6 @@ namespace.sphal.asan.search.paths += /data/asan/vendor/${LIB}/egl
 namespace.sphal.asan.search.paths += /vendor/${LIB}/egl
 namespace.sphal.asan.search.paths += /data/asan/vendor/${LIB}/hw
 namespace.sphal.asan.search.paths += /vendor/${LIB}/hw
-namespace.sphal.asan.search.paths += /apex/com.vendor.service2/${LIB}/egl
 namespace.sphal.asan.permitted.paths = /data/asan/odm/${LIB}
 namespace.sphal.asan.permitted.paths += /odm/${LIB}
 namespace.sphal.asan.permitted.paths += /data/asan/vendor/${LIB}
@@ -1876,7 +1865,6 @@ namespace.sphal.asan.permitted.paths += /data/asan/vendor/odm/${LIB}
 namespace.sphal.asan.permitted.paths += /vendor/odm/${LIB}
 namespace.sphal.asan.permitted.paths += /data/asan/system/vendor/${LIB}
 namespace.sphal.asan.permitted.paths += /system/vendor/${LIB}
-namespace.sphal.asan.permitted.paths += /apex/com.vendor.service2/${LIB}/egl
 namespace.sphal.hwasan.search.paths = /odm/${LIB}/hwasan
 namespace.sphal.hwasan.search.paths += /odm/${LIB}
 namespace.sphal.hwasan.search.paths += /vendor/${LIB}/hwasan
@@ -1885,8 +1873,6 @@ namespace.sphal.hwasan.search.paths += /vendor/${LIB}/egl/hwasan
 namespace.sphal.hwasan.search.paths += /vendor/${LIB}/egl
 namespace.sphal.hwasan.search.paths += /vendor/${LIB}/hw/hwasan
 namespace.sphal.hwasan.search.paths += /vendor/${LIB}/hw
-namespace.sphal.hwasan.search.paths += /apex/com.vendor.service2/${LIB}/egl/hwasan
-namespace.sphal.hwasan.search.paths += /apex/com.vendor.service2/${LIB}/egl
 namespace.sphal.hwasan.permitted.paths = /odm/${LIB}/hwasan
 namespace.sphal.hwasan.permitted.paths += /odm/${LIB}
 namespace.sphal.hwasan.permitted.paths += /vendor/${LIB}/hwasan
@@ -1895,8 +1881,6 @@ namespace.sphal.hwasan.permitted.paths += /vendor/odm/${LIB}/hwasan
 namespace.sphal.hwasan.permitted.paths += /vendor/odm/${LIB}
 namespace.sphal.hwasan.permitted.paths += /system/vendor/${LIB}/hwasan
 namespace.sphal.hwasan.permitted.paths += /system/vendor/${LIB}
-namespace.sphal.hwasan.permitted.paths += /apex/com.vendor.service2/${LIB}/egl/hwasan
-namespace.sphal.hwasan.permitted.paths += /apex/com.vendor.service2/${LIB}/egl
 namespace.sphal.links = default,rs,vndk,com_android_neuralnetworks
 namespace.sphal.link.default.shared_libs = libEGL.so:libGLESv1_CM.so:libGLESv2.so:libGLESv3.so:libRS.so:libandroid_net.so:libbinder_ndk.so:libc.so:libcgrouprc.so:libclang_rt.asan-i686-android.so:libdl.so:liblog.so:libm.so:libmediandk.so:libnativewindow.so:libsync.so:libvndksupport.so:libvulkan.so:libdl_android.so:libclang_rt.asan-arm-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so
 namespace.sphal.link.rs.shared_libs = libRS_internal.so
diff --git a/testdata/golden_output/vndk-in-system/com.android.adbd/ld.config.txt b/testdata/golden_output/vndk-in-system/com.android.adbd/ld.config.txt
index afdceb6..0cb10ea 100644
--- a/testdata/golden_output/vndk-in-system/com.android.adbd/ld.config.txt
+++ b/testdata/golden_output/vndk-in-system/com.android.adbd/ld.config.txt
@@ -195,12 +195,10 @@ namespace.sphal.search.paths = /odm/${LIB}
 namespace.sphal.search.paths += /vendor/${LIB}
 namespace.sphal.search.paths += /vendor/${LIB}/egl
 namespace.sphal.search.paths += /vendor/${LIB}/hw
-namespace.sphal.search.paths += /apex/com.vendor.service2/${LIB}/egl
 namespace.sphal.permitted.paths = /odm/${LIB}
 namespace.sphal.permitted.paths += /vendor/${LIB}
 namespace.sphal.permitted.paths += /vendor/odm/${LIB}
 namespace.sphal.permitted.paths += /system/vendor/${LIB}
-namespace.sphal.permitted.paths += /apex/com.vendor.service2/${LIB}/egl
 namespace.sphal.asan.search.paths = /data/asan/odm/${LIB}
 namespace.sphal.asan.search.paths += /odm/${LIB}
 namespace.sphal.asan.search.paths += /data/asan/vendor/${LIB}
@@ -209,7 +207,6 @@ namespace.sphal.asan.search.paths += /data/asan/vendor/${LIB}/egl
 namespace.sphal.asan.search.paths += /vendor/${LIB}/egl
 namespace.sphal.asan.search.paths += /data/asan/vendor/${LIB}/hw
 namespace.sphal.asan.search.paths += /vendor/${LIB}/hw
-namespace.sphal.asan.search.paths += /apex/com.vendor.service2/${LIB}/egl
 namespace.sphal.asan.permitted.paths = /data/asan/odm/${LIB}
 namespace.sphal.asan.permitted.paths += /odm/${LIB}
 namespace.sphal.asan.permitted.paths += /data/asan/vendor/${LIB}
@@ -218,7 +215,6 @@ namespace.sphal.asan.permitted.paths += /data/asan/vendor/odm/${LIB}
 namespace.sphal.asan.permitted.paths += /vendor/odm/${LIB}
 namespace.sphal.asan.permitted.paths += /data/asan/system/vendor/${LIB}
 namespace.sphal.asan.permitted.paths += /system/vendor/${LIB}
-namespace.sphal.asan.permitted.paths += /apex/com.vendor.service2/${LIB}/egl
 namespace.sphal.hwasan.search.paths = /odm/${LIB}/hwasan
 namespace.sphal.hwasan.search.paths += /odm/${LIB}
 namespace.sphal.hwasan.search.paths += /vendor/${LIB}/hwasan
@@ -227,8 +223,6 @@ namespace.sphal.hwasan.search.paths += /vendor/${LIB}/egl/hwasan
 namespace.sphal.hwasan.search.paths += /vendor/${LIB}/egl
 namespace.sphal.hwasan.search.paths += /vendor/${LIB}/hw/hwasan
 namespace.sphal.hwasan.search.paths += /vendor/${LIB}/hw
-namespace.sphal.hwasan.search.paths += /apex/com.vendor.service2/${LIB}/egl/hwasan
-namespace.sphal.hwasan.search.paths += /apex/com.vendor.service2/${LIB}/egl
 namespace.sphal.hwasan.permitted.paths = /odm/${LIB}/hwasan
 namespace.sphal.hwasan.permitted.paths += /odm/${LIB}
 namespace.sphal.hwasan.permitted.paths += /vendor/${LIB}/hwasan
@@ -237,8 +231,6 @@ namespace.sphal.hwasan.permitted.paths += /vendor/odm/${LIB}/hwasan
 namespace.sphal.hwasan.permitted.paths += /vendor/odm/${LIB}
 namespace.sphal.hwasan.permitted.paths += /system/vendor/${LIB}/hwasan
 namespace.sphal.hwasan.permitted.paths += /system/vendor/${LIB}
-namespace.sphal.hwasan.permitted.paths += /apex/com.vendor.service2/${LIB}/egl/hwasan
-namespace.sphal.hwasan.permitted.paths += /apex/com.vendor.service2/${LIB}/egl
 namespace.sphal.links = system,vndk,com_android_neuralnetworks
 namespace.sphal.link.system.shared_libs = libEGL.so:libGLESv1_CM.so:libGLESv2.so:libGLESv3.so:libRS.so:libandroid_net.so:libbinder_ndk.so:libc.so:libcgrouprc.so:libclang_rt.asan-i686-android.so:libdl.so:liblog.so:libm.so:libmediandk.so:libnativewindow.so:libsync.so:libvndksupport.so:libvulkan.so:libdl_android.so:libclang_rt.asan-arm-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so
 namespace.sphal.link.vndk.shared_libs = android.hardware.graphics.common@1.0.so:android.hardware.graphics.common@1.1.so:android.hardware.graphics.common@1.2.so:android.hardware.graphics.mapper@2.0.so:android.hardware.graphics.mapper@2.1.so:android.hardware.graphics.mapper@3.0.so:android.hardware.renderscript@1.0.so:android.hidl.memory.token@1.0.so:android.hidl.memory@1.0-impl.so:android.hidl.memory@1.0.so:android.hidl.safe_union@1.0.so:libRSCpuRef.so:libRSDriver.so:libRS_internal.so:libbase.so:libbcinfo.so:libc++.so:libcutils.so:libhardware.so:libhidlbase.so:libhidlmemory.so:libion.so:libjsoncpp.so:liblzma.so:libprocessgroup.so:libunwindstack.so:libutils.so:libutilscallstack.so:libz.so
diff --git a/testdata/golden_output/vndk-in-system/com.android.art/ld.config.txt b/testdata/golden_output/vndk-in-system/com.android.art/ld.config.txt
index 22c5b51..f77f942 100644
--- a/testdata/golden_output/vndk-in-system/com.android.art/ld.config.txt
+++ b/testdata/golden_output/vndk-in-system/com.android.art/ld.config.txt
@@ -229,12 +229,10 @@ namespace.sphal.search.paths = /odm/${LIB}
 namespace.sphal.search.paths += /vendor/${LIB}
 namespace.sphal.search.paths += /vendor/${LIB}/egl
 namespace.sphal.search.paths += /vendor/${LIB}/hw
-namespace.sphal.search.paths += /apex/com.vendor.service2/${LIB}/egl
 namespace.sphal.permitted.paths = /odm/${LIB}
 namespace.sphal.permitted.paths += /vendor/${LIB}
 namespace.sphal.permitted.paths += /vendor/odm/${LIB}
 namespace.sphal.permitted.paths += /system/vendor/${LIB}
-namespace.sphal.permitted.paths += /apex/com.vendor.service2/${LIB}/egl
 namespace.sphal.asan.search.paths = /data/asan/odm/${LIB}
 namespace.sphal.asan.search.paths += /odm/${LIB}
 namespace.sphal.asan.search.paths += /data/asan/vendor/${LIB}
@@ -243,7 +241,6 @@ namespace.sphal.asan.search.paths += /data/asan/vendor/${LIB}/egl
 namespace.sphal.asan.search.paths += /vendor/${LIB}/egl
 namespace.sphal.asan.search.paths += /data/asan/vendor/${LIB}/hw
 namespace.sphal.asan.search.paths += /vendor/${LIB}/hw
-namespace.sphal.asan.search.paths += /apex/com.vendor.service2/${LIB}/egl
 namespace.sphal.asan.permitted.paths = /data/asan/odm/${LIB}
 namespace.sphal.asan.permitted.paths += /odm/${LIB}
 namespace.sphal.asan.permitted.paths += /data/asan/vendor/${LIB}
@@ -252,7 +249,6 @@ namespace.sphal.asan.permitted.paths += /data/asan/vendor/odm/${LIB}
 namespace.sphal.asan.permitted.paths += /vendor/odm/${LIB}
 namespace.sphal.asan.permitted.paths += /data/asan/system/vendor/${LIB}
 namespace.sphal.asan.permitted.paths += /system/vendor/${LIB}
-namespace.sphal.asan.permitted.paths += /apex/com.vendor.service2/${LIB}/egl
 namespace.sphal.hwasan.search.paths = /odm/${LIB}/hwasan
 namespace.sphal.hwasan.search.paths += /odm/${LIB}
 namespace.sphal.hwasan.search.paths += /vendor/${LIB}/hwasan
@@ -261,8 +257,6 @@ namespace.sphal.hwasan.search.paths += /vendor/${LIB}/egl/hwasan
 namespace.sphal.hwasan.search.paths += /vendor/${LIB}/egl
 namespace.sphal.hwasan.search.paths += /vendor/${LIB}/hw/hwasan
 namespace.sphal.hwasan.search.paths += /vendor/${LIB}/hw
-namespace.sphal.hwasan.search.paths += /apex/com.vendor.service2/${LIB}/egl/hwasan
-namespace.sphal.hwasan.search.paths += /apex/com.vendor.service2/${LIB}/egl
 namespace.sphal.hwasan.permitted.paths = /odm/${LIB}/hwasan
 namespace.sphal.hwasan.permitted.paths += /odm/${LIB}
 namespace.sphal.hwasan.permitted.paths += /vendor/${LIB}/hwasan
@@ -271,8 +265,6 @@ namespace.sphal.hwasan.permitted.paths += /vendor/odm/${LIB}/hwasan
 namespace.sphal.hwasan.permitted.paths += /vendor/odm/${LIB}
 namespace.sphal.hwasan.permitted.paths += /system/vendor/${LIB}/hwasan
 namespace.sphal.hwasan.permitted.paths += /system/vendor/${LIB}
-namespace.sphal.hwasan.permitted.paths += /apex/com.vendor.service2/${LIB}/egl/hwasan
-namespace.sphal.hwasan.permitted.paths += /apex/com.vendor.service2/${LIB}/egl
 namespace.sphal.links = system,vndk,com_android_neuralnetworks
 namespace.sphal.link.system.shared_libs = libEGL.so:libGLESv1_CM.so:libGLESv2.so:libGLESv3.so:libRS.so:libandroid_net.so:libbinder_ndk.so:libc.so:libcgrouprc.so:libclang_rt.asan-i686-android.so:libdl.so:liblog.so:libm.so:libmediandk.so:libnativewindow.so:libsync.so:libvndksupport.so:libvulkan.so:libdl_android.so:libclang_rt.asan-arm-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so
 namespace.sphal.link.vndk.shared_libs = android.hardware.graphics.common@1.0.so:android.hardware.graphics.common@1.1.so:android.hardware.graphics.common@1.2.so:android.hardware.graphics.mapper@2.0.so:android.hardware.graphics.mapper@2.1.so:android.hardware.graphics.mapper@3.0.so:android.hardware.renderscript@1.0.so:android.hidl.memory.token@1.0.so:android.hidl.memory@1.0-impl.so:android.hidl.memory@1.0.so:android.hidl.safe_union@1.0.so:libRSCpuRef.so:libRSDriver.so:libRS_internal.so:libbase.so:libbcinfo.so:libc++.so:libcutils.so:libhardware.so:libhidlbase.so:libhidlmemory.so:libion.so:libjsoncpp.so:liblzma.so:libprocessgroup.so:libunwindstack.so:libutils.so:libutilscallstack.so:libz.so
diff --git a/testdata/golden_output/vndk-in-system/com.android.conscrypt/ld.config.txt b/testdata/golden_output/vndk-in-system/com.android.conscrypt/ld.config.txt
index d2c1917..1dcea6e 100644
--- a/testdata/golden_output/vndk-in-system/com.android.conscrypt/ld.config.txt
+++ b/testdata/golden_output/vndk-in-system/com.android.conscrypt/ld.config.txt
@@ -217,12 +217,10 @@ namespace.sphal.search.paths = /odm/${LIB}
 namespace.sphal.search.paths += /vendor/${LIB}
 namespace.sphal.search.paths += /vendor/${LIB}/egl
 namespace.sphal.search.paths += /vendor/${LIB}/hw
-namespace.sphal.search.paths += /apex/com.vendor.service2/${LIB}/egl
 namespace.sphal.permitted.paths = /odm/${LIB}
 namespace.sphal.permitted.paths += /vendor/${LIB}
 namespace.sphal.permitted.paths += /vendor/odm/${LIB}
 namespace.sphal.permitted.paths += /system/vendor/${LIB}
-namespace.sphal.permitted.paths += /apex/com.vendor.service2/${LIB}/egl
 namespace.sphal.asan.search.paths = /data/asan/odm/${LIB}
 namespace.sphal.asan.search.paths += /odm/${LIB}
 namespace.sphal.asan.search.paths += /data/asan/vendor/${LIB}
@@ -231,7 +229,6 @@ namespace.sphal.asan.search.paths += /data/asan/vendor/${LIB}/egl
 namespace.sphal.asan.search.paths += /vendor/${LIB}/egl
 namespace.sphal.asan.search.paths += /data/asan/vendor/${LIB}/hw
 namespace.sphal.asan.search.paths += /vendor/${LIB}/hw
-namespace.sphal.asan.search.paths += /apex/com.vendor.service2/${LIB}/egl
 namespace.sphal.asan.permitted.paths = /data/asan/odm/${LIB}
 namespace.sphal.asan.permitted.paths += /odm/${LIB}
 namespace.sphal.asan.permitted.paths += /data/asan/vendor/${LIB}
@@ -240,7 +237,6 @@ namespace.sphal.asan.permitted.paths += /data/asan/vendor/odm/${LIB}
 namespace.sphal.asan.permitted.paths += /vendor/odm/${LIB}
 namespace.sphal.asan.permitted.paths += /data/asan/system/vendor/${LIB}
 namespace.sphal.asan.permitted.paths += /system/vendor/${LIB}
-namespace.sphal.asan.permitted.paths += /apex/com.vendor.service2/${LIB}/egl
 namespace.sphal.hwasan.search.paths = /odm/${LIB}/hwasan
 namespace.sphal.hwasan.search.paths += /odm/${LIB}
 namespace.sphal.hwasan.search.paths += /vendor/${LIB}/hwasan
@@ -249,8 +245,6 @@ namespace.sphal.hwasan.search.paths += /vendor/${LIB}/egl/hwasan
 namespace.sphal.hwasan.search.paths += /vendor/${LIB}/egl
 namespace.sphal.hwasan.search.paths += /vendor/${LIB}/hw/hwasan
 namespace.sphal.hwasan.search.paths += /vendor/${LIB}/hw
-namespace.sphal.hwasan.search.paths += /apex/com.vendor.service2/${LIB}/egl/hwasan
-namespace.sphal.hwasan.search.paths += /apex/com.vendor.service2/${LIB}/egl
 namespace.sphal.hwasan.permitted.paths = /odm/${LIB}/hwasan
 namespace.sphal.hwasan.permitted.paths += /odm/${LIB}
 namespace.sphal.hwasan.permitted.paths += /vendor/${LIB}/hwasan
@@ -259,8 +253,6 @@ namespace.sphal.hwasan.permitted.paths += /vendor/odm/${LIB}/hwasan
 namespace.sphal.hwasan.permitted.paths += /vendor/odm/${LIB}
 namespace.sphal.hwasan.permitted.paths += /system/vendor/${LIB}/hwasan
 namespace.sphal.hwasan.permitted.paths += /system/vendor/${LIB}
-namespace.sphal.hwasan.permitted.paths += /apex/com.vendor.service2/${LIB}/egl/hwasan
-namespace.sphal.hwasan.permitted.paths += /apex/com.vendor.service2/${LIB}/egl
 namespace.sphal.links = system,vndk,com_android_neuralnetworks
 namespace.sphal.link.system.shared_libs = libEGL.so:libGLESv1_CM.so:libGLESv2.so:libGLESv3.so:libRS.so:libandroid_net.so:libbinder_ndk.so:libc.so:libcgrouprc.so:libclang_rt.asan-i686-android.so:libdl.so:liblog.so:libm.so:libmediandk.so:libnativewindow.so:libsync.so:libvndksupport.so:libvulkan.so:libdl_android.so:libclang_rt.asan-arm-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so
 namespace.sphal.link.vndk.shared_libs = android.hardware.graphics.common@1.0.so:android.hardware.graphics.common@1.1.so:android.hardware.graphics.common@1.2.so:android.hardware.graphics.mapper@2.0.so:android.hardware.graphics.mapper@2.1.so:android.hardware.graphics.mapper@3.0.so:android.hardware.renderscript@1.0.so:android.hidl.memory.token@1.0.so:android.hidl.memory@1.0-impl.so:android.hidl.memory@1.0.so:android.hidl.safe_union@1.0.so:libRSCpuRef.so:libRSDriver.so:libRS_internal.so:libbase.so:libbcinfo.so:libc++.so:libcutils.so:libhardware.so:libhidlbase.so:libhidlmemory.so:libion.so:libjsoncpp.so:liblzma.so:libprocessgroup.so:libunwindstack.so:libutils.so:libutilscallstack.so:libz.so
diff --git a/testdata/golden_output/vndk-in-system/com.android.media.swcodec/ld.config.txt b/testdata/golden_output/vndk-in-system/com.android.media.swcodec/ld.config.txt
index 72fd31f..ad917a9 100644
--- a/testdata/golden_output/vndk-in-system/com.android.media.swcodec/ld.config.txt
+++ b/testdata/golden_output/vndk-in-system/com.android.media.swcodec/ld.config.txt
@@ -216,12 +216,10 @@ namespace.sphal.search.paths = /odm/${LIB}
 namespace.sphal.search.paths += /vendor/${LIB}
 namespace.sphal.search.paths += /vendor/${LIB}/egl
 namespace.sphal.search.paths += /vendor/${LIB}/hw
-namespace.sphal.search.paths += /apex/com.vendor.service2/${LIB}/egl
 namespace.sphal.permitted.paths = /odm/${LIB}
 namespace.sphal.permitted.paths += /vendor/${LIB}
 namespace.sphal.permitted.paths += /vendor/odm/${LIB}
 namespace.sphal.permitted.paths += /system/vendor/${LIB}
-namespace.sphal.permitted.paths += /apex/com.vendor.service2/${LIB}/egl
 namespace.sphal.asan.search.paths = /data/asan/odm/${LIB}
 namespace.sphal.asan.search.paths += /odm/${LIB}
 namespace.sphal.asan.search.paths += /data/asan/vendor/${LIB}
@@ -230,7 +228,6 @@ namespace.sphal.asan.search.paths += /data/asan/vendor/${LIB}/egl
 namespace.sphal.asan.search.paths += /vendor/${LIB}/egl
 namespace.sphal.asan.search.paths += /data/asan/vendor/${LIB}/hw
 namespace.sphal.asan.search.paths += /vendor/${LIB}/hw
-namespace.sphal.asan.search.paths += /apex/com.vendor.service2/${LIB}/egl
 namespace.sphal.asan.permitted.paths = /data/asan/odm/${LIB}
 namespace.sphal.asan.permitted.paths += /odm/${LIB}
 namespace.sphal.asan.permitted.paths += /data/asan/vendor/${LIB}
@@ -239,7 +236,6 @@ namespace.sphal.asan.permitted.paths += /data/asan/vendor/odm/${LIB}
 namespace.sphal.asan.permitted.paths += /vendor/odm/${LIB}
 namespace.sphal.asan.permitted.paths += /data/asan/system/vendor/${LIB}
 namespace.sphal.asan.permitted.paths += /system/vendor/${LIB}
-namespace.sphal.asan.permitted.paths += /apex/com.vendor.service2/${LIB}/egl
 namespace.sphal.hwasan.search.paths = /odm/${LIB}/hwasan
 namespace.sphal.hwasan.search.paths += /odm/${LIB}
 namespace.sphal.hwasan.search.paths += /vendor/${LIB}/hwasan
@@ -248,8 +244,6 @@ namespace.sphal.hwasan.search.paths += /vendor/${LIB}/egl/hwasan
 namespace.sphal.hwasan.search.paths += /vendor/${LIB}/egl
 namespace.sphal.hwasan.search.paths += /vendor/${LIB}/hw/hwasan
 namespace.sphal.hwasan.search.paths += /vendor/${LIB}/hw
-namespace.sphal.hwasan.search.paths += /apex/com.vendor.service2/${LIB}/egl/hwasan
-namespace.sphal.hwasan.search.paths += /apex/com.vendor.service2/${LIB}/egl
 namespace.sphal.hwasan.permitted.paths = /odm/${LIB}/hwasan
 namespace.sphal.hwasan.permitted.paths += /odm/${LIB}
 namespace.sphal.hwasan.permitted.paths += /vendor/${LIB}/hwasan
@@ -258,8 +252,6 @@ namespace.sphal.hwasan.permitted.paths += /vendor/odm/${LIB}/hwasan
 namespace.sphal.hwasan.permitted.paths += /vendor/odm/${LIB}
 namespace.sphal.hwasan.permitted.paths += /system/vendor/${LIB}/hwasan
 namespace.sphal.hwasan.permitted.paths += /system/vendor/${LIB}
-namespace.sphal.hwasan.permitted.paths += /apex/com.vendor.service2/${LIB}/egl/hwasan
-namespace.sphal.hwasan.permitted.paths += /apex/com.vendor.service2/${LIB}/egl
 namespace.sphal.links = system,vndk,com_android_neuralnetworks
 namespace.sphal.link.system.shared_libs = libEGL.so:libGLESv1_CM.so:libGLESv2.so:libGLESv3.so:libRS.so:libandroid_net.so:libbinder_ndk.so:libc.so:libcgrouprc.so:libclang_rt.asan-i686-android.so:libdl.so:liblog.so:libm.so:libmediandk.so:libnativewindow.so:libsync.so:libvndksupport.so:libvulkan.so:libdl_android.so:libclang_rt.asan-arm-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so
 namespace.sphal.link.vndk.shared_libs = android.hardware.graphics.common@1.0.so:android.hardware.graphics.common@1.1.so:android.hardware.graphics.common@1.2.so:android.hardware.graphics.mapper@2.0.so:android.hardware.graphics.mapper@2.1.so:android.hardware.graphics.mapper@3.0.so:android.hardware.renderscript@1.0.so:android.hidl.memory.token@1.0.so:android.hidl.memory@1.0-impl.so:android.hidl.memory@1.0.so:android.hidl.safe_union@1.0.so:libRSCpuRef.so:libRSDriver.so:libRS_internal.so:libbase.so:libbcinfo.so:libc++.so:libcutils.so:libhardware.so:libhidlbase.so:libhidlmemory.so:libion.so:libjsoncpp.so:liblzma.so:libprocessgroup.so:libunwindstack.so:libutils.so:libutilscallstack.so:libz.so
diff --git a/testdata/golden_output/vndk-in-system/com.android.runtime/ld.config.txt b/testdata/golden_output/vndk-in-system/com.android.runtime/ld.config.txt
index b7ccf80..c5a9dd0 100644
--- a/testdata/golden_output/vndk-in-system/com.android.runtime/ld.config.txt
+++ b/testdata/golden_output/vndk-in-system/com.android.runtime/ld.config.txt
@@ -199,12 +199,10 @@ namespace.sphal.search.paths = /odm/${LIB}
 namespace.sphal.search.paths += /vendor/${LIB}
 namespace.sphal.search.paths += /vendor/${LIB}/egl
 namespace.sphal.search.paths += /vendor/${LIB}/hw
-namespace.sphal.search.paths += /apex/com.vendor.service2/${LIB}/egl
 namespace.sphal.permitted.paths = /odm/${LIB}
 namespace.sphal.permitted.paths += /vendor/${LIB}
 namespace.sphal.permitted.paths += /vendor/odm/${LIB}
 namespace.sphal.permitted.paths += /system/vendor/${LIB}
-namespace.sphal.permitted.paths += /apex/com.vendor.service2/${LIB}/egl
 namespace.sphal.asan.search.paths = /data/asan/odm/${LIB}
 namespace.sphal.asan.search.paths += /odm/${LIB}
 namespace.sphal.asan.search.paths += /data/asan/vendor/${LIB}
@@ -213,7 +211,6 @@ namespace.sphal.asan.search.paths += /data/asan/vendor/${LIB}/egl
 namespace.sphal.asan.search.paths += /vendor/${LIB}/egl
 namespace.sphal.asan.search.paths += /data/asan/vendor/${LIB}/hw
 namespace.sphal.asan.search.paths += /vendor/${LIB}/hw
-namespace.sphal.asan.search.paths += /apex/com.vendor.service2/${LIB}/egl
 namespace.sphal.asan.permitted.paths = /data/asan/odm/${LIB}
 namespace.sphal.asan.permitted.paths += /odm/${LIB}
 namespace.sphal.asan.permitted.paths += /data/asan/vendor/${LIB}
@@ -222,7 +219,6 @@ namespace.sphal.asan.permitted.paths += /data/asan/vendor/odm/${LIB}
 namespace.sphal.asan.permitted.paths += /vendor/odm/${LIB}
 namespace.sphal.asan.permitted.paths += /data/asan/system/vendor/${LIB}
 namespace.sphal.asan.permitted.paths += /system/vendor/${LIB}
-namespace.sphal.asan.permitted.paths += /apex/com.vendor.service2/${LIB}/egl
 namespace.sphal.hwasan.search.paths = /odm/${LIB}/hwasan
 namespace.sphal.hwasan.search.paths += /odm/${LIB}
 namespace.sphal.hwasan.search.paths += /vendor/${LIB}/hwasan
@@ -231,8 +227,6 @@ namespace.sphal.hwasan.search.paths += /vendor/${LIB}/egl/hwasan
 namespace.sphal.hwasan.search.paths += /vendor/${LIB}/egl
 namespace.sphal.hwasan.search.paths += /vendor/${LIB}/hw/hwasan
 namespace.sphal.hwasan.search.paths += /vendor/${LIB}/hw
-namespace.sphal.hwasan.search.paths += /apex/com.vendor.service2/${LIB}/egl/hwasan
-namespace.sphal.hwasan.search.paths += /apex/com.vendor.service2/${LIB}/egl
 namespace.sphal.hwasan.permitted.paths = /odm/${LIB}/hwasan
 namespace.sphal.hwasan.permitted.paths += /odm/${LIB}
 namespace.sphal.hwasan.permitted.paths += /vendor/${LIB}/hwasan
@@ -241,8 +235,6 @@ namespace.sphal.hwasan.permitted.paths += /vendor/odm/${LIB}/hwasan
 namespace.sphal.hwasan.permitted.paths += /vendor/odm/${LIB}
 namespace.sphal.hwasan.permitted.paths += /system/vendor/${LIB}/hwasan
 namespace.sphal.hwasan.permitted.paths += /system/vendor/${LIB}
-namespace.sphal.hwasan.permitted.paths += /apex/com.vendor.service2/${LIB}/egl/hwasan
-namespace.sphal.hwasan.permitted.paths += /apex/com.vendor.service2/${LIB}/egl
 namespace.sphal.links = system,vndk,com_android_neuralnetworks
 namespace.sphal.link.system.shared_libs = libEGL.so:libGLESv1_CM.so:libGLESv2.so:libGLESv3.so:libRS.so:libandroid_net.so:libbinder_ndk.so:libc.so:libcgrouprc.so:libclang_rt.asan-i686-android.so:libdl.so:liblog.so:libm.so:libmediandk.so:libnativewindow.so:libsync.so:libvndksupport.so:libvulkan.so:libdl_android.so:libclang_rt.asan-arm-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so
 namespace.sphal.link.vndk.shared_libs = android.hardware.graphics.common@1.0.so:android.hardware.graphics.common@1.1.so:android.hardware.graphics.common@1.2.so:android.hardware.graphics.mapper@2.0.so:android.hardware.graphics.mapper@2.1.so:android.hardware.graphics.mapper@3.0.so:android.hardware.renderscript@1.0.so:android.hidl.memory.token@1.0.so:android.hidl.memory@1.0-impl.so:android.hidl.memory@1.0.so:android.hidl.safe_union@1.0.so:libRSCpuRef.so:libRSDriver.so:libRS_internal.so:libbase.so:libbcinfo.so:libc++.so:libcutils.so:libhardware.so:libhidlbase.so:libhidlmemory.so:libion.so:libjsoncpp.so:liblzma.so:libprocessgroup.so:libunwindstack.so:libutils.so:libutilscallstack.so:libz.so
diff --git a/testdata/golden_output/vndk-in-system/com.android.sdkext/ld.config.txt b/testdata/golden_output/vndk-in-system/com.android.sdkext/ld.config.txt
index 40264a0..73612ca 100644
--- a/testdata/golden_output/vndk-in-system/com.android.sdkext/ld.config.txt
+++ b/testdata/golden_output/vndk-in-system/com.android.sdkext/ld.config.txt
@@ -216,12 +216,10 @@ namespace.sphal.search.paths = /odm/${LIB}
 namespace.sphal.search.paths += /vendor/${LIB}
 namespace.sphal.search.paths += /vendor/${LIB}/egl
 namespace.sphal.search.paths += /vendor/${LIB}/hw
-namespace.sphal.search.paths += /apex/com.vendor.service2/${LIB}/egl
 namespace.sphal.permitted.paths = /odm/${LIB}
 namespace.sphal.permitted.paths += /vendor/${LIB}
 namespace.sphal.permitted.paths += /vendor/odm/${LIB}
 namespace.sphal.permitted.paths += /system/vendor/${LIB}
-namespace.sphal.permitted.paths += /apex/com.vendor.service2/${LIB}/egl
 namespace.sphal.asan.search.paths = /data/asan/odm/${LIB}
 namespace.sphal.asan.search.paths += /odm/${LIB}
 namespace.sphal.asan.search.paths += /data/asan/vendor/${LIB}
@@ -230,7 +228,6 @@ namespace.sphal.asan.search.paths += /data/asan/vendor/${LIB}/egl
 namespace.sphal.asan.search.paths += /vendor/${LIB}/egl
 namespace.sphal.asan.search.paths += /data/asan/vendor/${LIB}/hw
 namespace.sphal.asan.search.paths += /vendor/${LIB}/hw
-namespace.sphal.asan.search.paths += /apex/com.vendor.service2/${LIB}/egl
 namespace.sphal.asan.permitted.paths = /data/asan/odm/${LIB}
 namespace.sphal.asan.permitted.paths += /odm/${LIB}
 namespace.sphal.asan.permitted.paths += /data/asan/vendor/${LIB}
@@ -239,7 +236,6 @@ namespace.sphal.asan.permitted.paths += /data/asan/vendor/odm/${LIB}
 namespace.sphal.asan.permitted.paths += /vendor/odm/${LIB}
 namespace.sphal.asan.permitted.paths += /data/asan/system/vendor/${LIB}
 namespace.sphal.asan.permitted.paths += /system/vendor/${LIB}
-namespace.sphal.asan.permitted.paths += /apex/com.vendor.service2/${LIB}/egl
 namespace.sphal.hwasan.search.paths = /odm/${LIB}/hwasan
 namespace.sphal.hwasan.search.paths += /odm/${LIB}
 namespace.sphal.hwasan.search.paths += /vendor/${LIB}/hwasan
@@ -248,8 +244,6 @@ namespace.sphal.hwasan.search.paths += /vendor/${LIB}/egl/hwasan
 namespace.sphal.hwasan.search.paths += /vendor/${LIB}/egl
 namespace.sphal.hwasan.search.paths += /vendor/${LIB}/hw/hwasan
 namespace.sphal.hwasan.search.paths += /vendor/${LIB}/hw
-namespace.sphal.hwasan.search.paths += /apex/com.vendor.service2/${LIB}/egl/hwasan
-namespace.sphal.hwasan.search.paths += /apex/com.vendor.service2/${LIB}/egl
 namespace.sphal.hwasan.permitted.paths = /odm/${LIB}/hwasan
 namespace.sphal.hwasan.permitted.paths += /odm/${LIB}
 namespace.sphal.hwasan.permitted.paths += /vendor/${LIB}/hwasan
@@ -258,8 +252,6 @@ namespace.sphal.hwasan.permitted.paths += /vendor/odm/${LIB}/hwasan
 namespace.sphal.hwasan.permitted.paths += /vendor/odm/${LIB}
 namespace.sphal.hwasan.permitted.paths += /system/vendor/${LIB}/hwasan
 namespace.sphal.hwasan.permitted.paths += /system/vendor/${LIB}
-namespace.sphal.hwasan.permitted.paths += /apex/com.vendor.service2/${LIB}/egl/hwasan
-namespace.sphal.hwasan.permitted.paths += /apex/com.vendor.service2/${LIB}/egl
 namespace.sphal.links = system,vndk,com_android_neuralnetworks
 namespace.sphal.link.system.shared_libs = libEGL.so:libGLESv1_CM.so:libGLESv2.so:libGLESv3.so:libRS.so:libandroid_net.so:libbinder_ndk.so:libc.so:libcgrouprc.so:libclang_rt.asan-i686-android.so:libdl.so:liblog.so:libm.so:libmediandk.so:libnativewindow.so:libsync.so:libvndksupport.so:libvulkan.so:libdl_android.so:libclang_rt.asan-arm-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so
 namespace.sphal.link.vndk.shared_libs = android.hardware.graphics.common@1.0.so:android.hardware.graphics.common@1.1.so:android.hardware.graphics.common@1.2.so:android.hardware.graphics.mapper@2.0.so:android.hardware.graphics.mapper@2.1.so:android.hardware.graphics.mapper@3.0.so:android.hardware.renderscript@1.0.so:android.hidl.memory.token@1.0.so:android.hidl.memory@1.0-impl.so:android.hidl.memory@1.0.so:android.hidl.safe_union@1.0.so:libRSCpuRef.so:libRSDriver.so:libRS_internal.so:libbase.so:libbcinfo.so:libc++.so:libcutils.so:libhardware.so:libhidlbase.so:libhidlmemory.so:libion.so:libjsoncpp.so:liblzma.so:libprocessgroup.so:libunwindstack.so:libutils.so:libutilscallstack.so:libz.so
diff --git a/testdata/golden_output/vndk-in-system/com.product.service1/ld.config.txt b/testdata/golden_output/vndk-in-system/com.product.service1/ld.config.txt
index bfe3b06..df95916 100644
--- a/testdata/golden_output/vndk-in-system/com.product.service1/ld.config.txt
+++ b/testdata/golden_output/vndk-in-system/com.product.service1/ld.config.txt
@@ -236,12 +236,10 @@ namespace.sphal.search.paths = /odm/${LIB}
 namespace.sphal.search.paths += /vendor/${LIB}
 namespace.sphal.search.paths += /vendor/${LIB}/egl
 namespace.sphal.search.paths += /vendor/${LIB}/hw
-namespace.sphal.search.paths += /apex/com.vendor.service2/${LIB}/egl
 namespace.sphal.permitted.paths = /odm/${LIB}
 namespace.sphal.permitted.paths += /vendor/${LIB}
 namespace.sphal.permitted.paths += /vendor/odm/${LIB}
 namespace.sphal.permitted.paths += /system/vendor/${LIB}
-namespace.sphal.permitted.paths += /apex/com.vendor.service2/${LIB}/egl
 namespace.sphal.asan.search.paths = /data/asan/odm/${LIB}
 namespace.sphal.asan.search.paths += /odm/${LIB}
 namespace.sphal.asan.search.paths += /data/asan/vendor/${LIB}
@@ -250,7 +248,6 @@ namespace.sphal.asan.search.paths += /data/asan/vendor/${LIB}/egl
 namespace.sphal.asan.search.paths += /vendor/${LIB}/egl
 namespace.sphal.asan.search.paths += /data/asan/vendor/${LIB}/hw
 namespace.sphal.asan.search.paths += /vendor/${LIB}/hw
-namespace.sphal.asan.search.paths += /apex/com.vendor.service2/${LIB}/egl
 namespace.sphal.asan.permitted.paths = /data/asan/odm/${LIB}
 namespace.sphal.asan.permitted.paths += /odm/${LIB}
 namespace.sphal.asan.permitted.paths += /data/asan/vendor/${LIB}
@@ -259,7 +256,6 @@ namespace.sphal.asan.permitted.paths += /data/asan/vendor/odm/${LIB}
 namespace.sphal.asan.permitted.paths += /vendor/odm/${LIB}
 namespace.sphal.asan.permitted.paths += /data/asan/system/vendor/${LIB}
 namespace.sphal.asan.permitted.paths += /system/vendor/${LIB}
-namespace.sphal.asan.permitted.paths += /apex/com.vendor.service2/${LIB}/egl
 namespace.sphal.hwasan.search.paths = /odm/${LIB}/hwasan
 namespace.sphal.hwasan.search.paths += /odm/${LIB}
 namespace.sphal.hwasan.search.paths += /vendor/${LIB}/hwasan
@@ -268,8 +264,6 @@ namespace.sphal.hwasan.search.paths += /vendor/${LIB}/egl/hwasan
 namespace.sphal.hwasan.search.paths += /vendor/${LIB}/egl
 namespace.sphal.hwasan.search.paths += /vendor/${LIB}/hw/hwasan
 namespace.sphal.hwasan.search.paths += /vendor/${LIB}/hw
-namespace.sphal.hwasan.search.paths += /apex/com.vendor.service2/${LIB}/egl/hwasan
-namespace.sphal.hwasan.search.paths += /apex/com.vendor.service2/${LIB}/egl
 namespace.sphal.hwasan.permitted.paths = /odm/${LIB}/hwasan
 namespace.sphal.hwasan.permitted.paths += /odm/${LIB}
 namespace.sphal.hwasan.permitted.paths += /vendor/${LIB}/hwasan
@@ -278,8 +272,6 @@ namespace.sphal.hwasan.permitted.paths += /vendor/odm/${LIB}/hwasan
 namespace.sphal.hwasan.permitted.paths += /vendor/odm/${LIB}
 namespace.sphal.hwasan.permitted.paths += /system/vendor/${LIB}/hwasan
 namespace.sphal.hwasan.permitted.paths += /system/vendor/${LIB}
-namespace.sphal.hwasan.permitted.paths += /apex/com.vendor.service2/${LIB}/egl/hwasan
-namespace.sphal.hwasan.permitted.paths += /apex/com.vendor.service2/${LIB}/egl
 namespace.sphal.links = system,vndk,com_android_neuralnetworks
 namespace.sphal.link.system.shared_libs = libEGL.so:libGLESv1_CM.so:libGLESv2.so:libGLESv3.so:libRS.so:libandroid_net.so:libbinder_ndk.so:libc.so:libcgrouprc.so:libclang_rt.asan-i686-android.so:libdl.so:liblog.so:libm.so:libmediandk.so:libnativewindow.so:libsync.so:libvndksupport.so:libvulkan.so:libdl_android.so:libclang_rt.asan-arm-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so
 namespace.sphal.link.vndk.shared_libs = android.hardware.graphics.common@1.0.so:android.hardware.graphics.common@1.1.so:android.hardware.graphics.common@1.2.so:android.hardware.graphics.mapper@2.0.so:android.hardware.graphics.mapper@2.1.so:android.hardware.graphics.mapper@3.0.so:android.hardware.renderscript@1.0.so:android.hidl.memory.token@1.0.so:android.hidl.memory@1.0-impl.so:android.hidl.memory@1.0.so:android.hidl.safe_union@1.0.so:libRSCpuRef.so:libRSDriver.so:libRS_internal.so:libbase.so:libbcinfo.so:libc++.so:libcutils.so:libhardware.so:libhidlbase.so:libhidlmemory.so:libion.so:libjsoncpp.so:liblzma.so:libprocessgroup.so:libunwindstack.so:libutils.so:libutilscallstack.so:libz.so
diff --git a/testdata/golden_output/vndk-in-system/ld.config.txt b/testdata/golden_output/vndk-in-system/ld.config.txt
index 7a9fd43..044e3cc 100644
--- a/testdata/golden_output/vndk-in-system/ld.config.txt
+++ b/testdata/golden_output/vndk-in-system/ld.config.txt
@@ -485,12 +485,10 @@ namespace.sphal.search.paths = /odm/${LIB}
 namespace.sphal.search.paths += /vendor/${LIB}
 namespace.sphal.search.paths += /vendor/${LIB}/egl
 namespace.sphal.search.paths += /vendor/${LIB}/hw
-namespace.sphal.search.paths += /apex/com.vendor.service2/${LIB}/egl
 namespace.sphal.permitted.paths = /odm/${LIB}
 namespace.sphal.permitted.paths += /vendor/${LIB}
 namespace.sphal.permitted.paths += /vendor/odm/${LIB}
 namespace.sphal.permitted.paths += /system/vendor/${LIB}
-namespace.sphal.permitted.paths += /apex/com.vendor.service2/${LIB}/egl
 namespace.sphal.asan.search.paths = /data/asan/odm/${LIB}
 namespace.sphal.asan.search.paths += /odm/${LIB}
 namespace.sphal.asan.search.paths += /data/asan/vendor/${LIB}
@@ -499,7 +497,6 @@ namespace.sphal.asan.search.paths += /data/asan/vendor/${LIB}/egl
 namespace.sphal.asan.search.paths += /vendor/${LIB}/egl
 namespace.sphal.asan.search.paths += /data/asan/vendor/${LIB}/hw
 namespace.sphal.asan.search.paths += /vendor/${LIB}/hw
-namespace.sphal.asan.search.paths += /apex/com.vendor.service2/${LIB}/egl
 namespace.sphal.asan.permitted.paths = /data/asan/odm/${LIB}
 namespace.sphal.asan.permitted.paths += /odm/${LIB}
 namespace.sphal.asan.permitted.paths += /data/asan/vendor/${LIB}
@@ -508,7 +505,6 @@ namespace.sphal.asan.permitted.paths += /data/asan/vendor/odm/${LIB}
 namespace.sphal.asan.permitted.paths += /vendor/odm/${LIB}
 namespace.sphal.asan.permitted.paths += /data/asan/system/vendor/${LIB}
 namespace.sphal.asan.permitted.paths += /system/vendor/${LIB}
-namespace.sphal.asan.permitted.paths += /apex/com.vendor.service2/${LIB}/egl
 namespace.sphal.hwasan.search.paths = /odm/${LIB}/hwasan
 namespace.sphal.hwasan.search.paths += /odm/${LIB}
 namespace.sphal.hwasan.search.paths += /vendor/${LIB}/hwasan
@@ -517,8 +513,6 @@ namespace.sphal.hwasan.search.paths += /vendor/${LIB}/egl/hwasan
 namespace.sphal.hwasan.search.paths += /vendor/${LIB}/egl
 namespace.sphal.hwasan.search.paths += /vendor/${LIB}/hw/hwasan
 namespace.sphal.hwasan.search.paths += /vendor/${LIB}/hw
-namespace.sphal.hwasan.search.paths += /apex/com.vendor.service2/${LIB}/egl/hwasan
-namespace.sphal.hwasan.search.paths += /apex/com.vendor.service2/${LIB}/egl
 namespace.sphal.hwasan.permitted.paths = /odm/${LIB}/hwasan
 namespace.sphal.hwasan.permitted.paths += /odm/${LIB}
 namespace.sphal.hwasan.permitted.paths += /vendor/${LIB}/hwasan
@@ -527,8 +521,6 @@ namespace.sphal.hwasan.permitted.paths += /vendor/odm/${LIB}/hwasan
 namespace.sphal.hwasan.permitted.paths += /vendor/odm/${LIB}
 namespace.sphal.hwasan.permitted.paths += /system/vendor/${LIB}/hwasan
 namespace.sphal.hwasan.permitted.paths += /system/vendor/${LIB}
-namespace.sphal.hwasan.permitted.paths += /apex/com.vendor.service2/${LIB}/egl/hwasan
-namespace.sphal.hwasan.permitted.paths += /apex/com.vendor.service2/${LIB}/egl
 namespace.sphal.links = default,rs,vndk,com_android_neuralnetworks
 namespace.sphal.link.default.shared_libs = libEGL.so:libGLESv1_CM.so:libGLESv2.so:libGLESv3.so:libRS.so:libandroid_net.so:libbinder_ndk.so:libc.so:libcgrouprc.so:libclang_rt.asan-i686-android.so:libdl.so:liblog.so:libm.so:libmediandk.so:libnativewindow.so:libsync.so:libvndksupport.so:libvulkan.so:libdl_android.so:libclang_rt.asan-arm-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so
 namespace.sphal.link.rs.shared_libs = libRS_internal.so
@@ -1890,12 +1882,10 @@ namespace.sphal.search.paths = /odm/${LIB}
 namespace.sphal.search.paths += /vendor/${LIB}
 namespace.sphal.search.paths += /vendor/${LIB}/egl
 namespace.sphal.search.paths += /vendor/${LIB}/hw
-namespace.sphal.search.paths += /apex/com.vendor.service2/${LIB}/egl
 namespace.sphal.permitted.paths = /odm/${LIB}
 namespace.sphal.permitted.paths += /vendor/${LIB}
 namespace.sphal.permitted.paths += /vendor/odm/${LIB}
 namespace.sphal.permitted.paths += /system/vendor/${LIB}
-namespace.sphal.permitted.paths += /apex/com.vendor.service2/${LIB}/egl
 namespace.sphal.asan.search.paths = /data/asan/odm/${LIB}
 namespace.sphal.asan.search.paths += /odm/${LIB}
 namespace.sphal.asan.search.paths += /data/asan/vendor/${LIB}
@@ -1904,7 +1894,6 @@ namespace.sphal.asan.search.paths += /data/asan/vendor/${LIB}/egl
 namespace.sphal.asan.search.paths += /vendor/${LIB}/egl
 namespace.sphal.asan.search.paths += /data/asan/vendor/${LIB}/hw
 namespace.sphal.asan.search.paths += /vendor/${LIB}/hw
-namespace.sphal.asan.search.paths += /apex/com.vendor.service2/${LIB}/egl
 namespace.sphal.asan.permitted.paths = /data/asan/odm/${LIB}
 namespace.sphal.asan.permitted.paths += /odm/${LIB}
 namespace.sphal.asan.permitted.paths += /data/asan/vendor/${LIB}
@@ -1913,7 +1902,6 @@ namespace.sphal.asan.permitted.paths += /data/asan/vendor/odm/${LIB}
 namespace.sphal.asan.permitted.paths += /vendor/odm/${LIB}
 namespace.sphal.asan.permitted.paths += /data/asan/system/vendor/${LIB}
 namespace.sphal.asan.permitted.paths += /system/vendor/${LIB}
-namespace.sphal.asan.permitted.paths += /apex/com.vendor.service2/${LIB}/egl
 namespace.sphal.hwasan.search.paths = /odm/${LIB}/hwasan
 namespace.sphal.hwasan.search.paths += /odm/${LIB}
 namespace.sphal.hwasan.search.paths += /vendor/${LIB}/hwasan
@@ -1922,8 +1910,6 @@ namespace.sphal.hwasan.search.paths += /vendor/${LIB}/egl/hwasan
 namespace.sphal.hwasan.search.paths += /vendor/${LIB}/egl
 namespace.sphal.hwasan.search.paths += /vendor/${LIB}/hw/hwasan
 namespace.sphal.hwasan.search.paths += /vendor/${LIB}/hw
-namespace.sphal.hwasan.search.paths += /apex/com.vendor.service2/${LIB}/egl/hwasan
-namespace.sphal.hwasan.search.paths += /apex/com.vendor.service2/${LIB}/egl
 namespace.sphal.hwasan.permitted.paths = /odm/${LIB}/hwasan
 namespace.sphal.hwasan.permitted.paths += /odm/${LIB}
 namespace.sphal.hwasan.permitted.paths += /vendor/${LIB}/hwasan
@@ -1932,8 +1918,6 @@ namespace.sphal.hwasan.permitted.paths += /vendor/odm/${LIB}/hwasan
 namespace.sphal.hwasan.permitted.paths += /vendor/odm/${LIB}
 namespace.sphal.hwasan.permitted.paths += /system/vendor/${LIB}/hwasan
 namespace.sphal.hwasan.permitted.paths += /system/vendor/${LIB}
-namespace.sphal.hwasan.permitted.paths += /apex/com.vendor.service2/${LIB}/egl/hwasan
-namespace.sphal.hwasan.permitted.paths += /apex/com.vendor.service2/${LIB}/egl
 namespace.sphal.links = default,rs,vndk,com_android_neuralnetworks
 namespace.sphal.link.default.shared_libs = libEGL.so:libGLESv1_CM.so:libGLESv2.so:libGLESv3.so:libRS.so:libandroid_net.so:libbinder_ndk.so:libc.so:libcgrouprc.so:libclang_rt.asan-i686-android.so:libdl.so:liblog.so:libm.so:libmediandk.so:libnativewindow.so:libsync.so:libvndksupport.so:libvulkan.so:libdl_android.so:libclang_rt.asan-arm-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so
 namespace.sphal.link.rs.shared_libs = libRS_internal.so
diff --git a/testdata/root/vendor/apex/com.vendor.service2/etc/linker.config.json b/testdata/root/vendor/apex/com.vendor.service2/etc/linker.config.json
deleted file mode 100644
index d105258..0000000
--- a/testdata/root/vendor/apex/com.vendor.service2/etc/linker.config.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "contributions": [
-    {
-      "namespace": "sphal",
-      "paths": ["${LIB}/egl"]
-    }
-  ]
-}
\ No newline at end of file