Add dir.system = /product/app/ entry

This is a fallback for binaries in APKs being launched.

Bug: 160433462
Test: atest --host linkerconfig_diff_test
Change-Id: I3979b22994d7c801952c13d8bbfa013da78b69e2

diff --git a/contents/configuration/baseconfig.cc b/contents/configuration/baseconfig.cc
index 784aa5a..667c5c3 100644 (file)
--- a/contents/configuration/baseconfig.cc
+++ b/contents/configuration/baseconfig.cc
@@ -95,6 +95,9 @@ android::linkerconfig::modules::Configuration CreateBaseConfiguration(
       // Fallback entry to provide APEX namespace lookups for binaries anywhere
       // else. This must be last.
       {"/data", "system"},
+      // TODO(b/168556887): Remove this when we have a dedicated section for
+      // binaries in APKs
+      {Var("PRODUCT") + "/app/", "system"},
   };
 
   sections.emplace_back(BuildSystemSection(ctx));

diff --git a/testdata/golden_output/product-enabled/ld.config.txt b/testdata/golden_output/product-enabled/ld.config.txt
index 306a76d..f0e4148 100644 (file)
--- a/testdata/golden_output/product-enabled/ld.config.txt
+++ b/testdata/golden_output/product-enabled/ld.config.txt
@@ -22,6 +22,7 @@ dir.vendor = /data/local/tests/vendor
 dir.unrestricted = /data/local/tmp
 dir.postinstall = /postinstall
 dir.system = /data
+dir.system = /product/app/
 [system]
 additional.namespaces = com_android_adbd,com_android_art,com_android_conscrypt,com_android_cronet,com_android_i18n,com_android_media,com_android_neuralnetworks,com_android_os_statsd,com_android_resolv,com_android_runtime,rs,sphal,vndk,vndk_product
 namespace.default.isolated = true

diff --git a/testdata/golden_output/stage0/ld.config.txt b/testdata/golden_output/stage0/ld.config.txt
index c13bf17..e0597a9 100644 (file)
--- a/testdata/golden_output/stage0/ld.config.txt
+++ b/testdata/golden_output/stage0/ld.config.txt
@@ -9,6 +9,7 @@ dir.unrestricted = /data/local/tests/unrestricted
 dir.unrestricted = /data/local/tmp
 dir.postinstall = /postinstall
 dir.system = /data
+dir.system = /product/app/
 [system]
 namespace.default.isolated = true
 namespace.default.visible = true

diff --git a/testdata/golden_output/stage1/ld.config.txt b/testdata/golden_output/stage1/ld.config.txt
index cc9bcb9..caa3e72 100644 (file)
--- a/testdata/golden_output/stage1/ld.config.txt
+++ b/testdata/golden_output/stage1/ld.config.txt
@@ -22,6 +22,7 @@ dir.vendor = /data/local/tests/vendor
 dir.unrestricted = /data/local/tmp
 dir.postinstall = /postinstall
 dir.system = /data
+dir.system = /product/app/
 [system]
 additional.namespaces = com_android_art,com_android_i18n,com_android_runtime,rs,sphal,vndk
 namespace.default.isolated = true

diff --git a/testdata/golden_output/stage2/ld.config.txt b/testdata/golden_output/stage2/ld.config.txt
index cb153c5..bd8ffbe 100644 (file)
--- a/testdata/golden_output/stage2/ld.config.txt
+++ b/testdata/golden_output/stage2/ld.config.txt
@@ -22,6 +22,7 @@ dir.vendor = /data/local/tests/vendor
 dir.unrestricted = /data/local/tmp
 dir.postinstall = /postinstall
 dir.system = /data
+dir.system = /product/app/
 [system]
 additional.namespaces = com_android_adbd,com_android_art,com_android_conscrypt,com_android_cronet,com_android_i18n,com_android_media,com_android_neuralnetworks,com_android_os_statsd,com_android_resolv,com_android_runtime,rs,sphal,vndk
 namespace.default.isolated = true