summaryrefslogtreecommitdiffstats
path: root/rootdir
diff options
context:
space:
mode:
authorInseob Kim <inseob@google.com>2018-06-18 00:31:48 -0700
committerandroid-build-merger <android-build-merger@google.com>2018-06-18 00:31:48 -0700
commitaf818a799dc0ed74537e2c777408a85fbe18660f (patch)
tree99692ac5ffecd15c4d6ce5b8b8858b23be711958 /rootdir
parentd60dad16a38be1af164765976ac33317e5d043f0 (diff)
parentc733e5af3c4e5d712380d37f7ffcd74862c62b14 (diff)
downloadsystem_core-af818a799dc0ed74537e2c777408a85fbe18660f.tar.gz
system_core-af818a799dc0ed74537e2c777408a85fbe18660f.tar.bz2
system_core-af818a799dc0ed74537e2c777408a85fbe18660f.zip
Merge "Add /system/product/* paths to permitted paths"
am: c733e5af3c Change-Id: I010dc1ad943fbf4c2c8524bb4df4cd6d0c699caa
Diffstat (limited to 'rootdir')
-rw-r--r--rootdir/etc/ld.config.txt8
1 files changed, 8 insertions, 0 deletions
diff --git a/rootdir/etc/ld.config.txt b/rootdir/etc/ld.config.txt
index a0b1996ad..eebad2b3c 100644
--- a/rootdir/etc/ld.config.txt
+++ b/rootdir/etc/ld.config.txt
@@ -52,6 +52,7 @@ namespace.default.permitted.paths = /system/${LIB}/drm
namespace.default.permitted.paths += /system/${LIB}/extractors
namespace.default.permitted.paths += /system/${LIB}/hw
namespace.default.permitted.paths += /product/${LIB}
+namespace.default.permitted.paths += /system/product/${LIB}
# These are where odex files are located. libart has to be able to dlopen the files
namespace.default.permitted.paths += /system/framework
namespace.default.permitted.paths += /system/app
@@ -66,6 +67,9 @@ namespace.default.permitted.paths += /oem/app
namespace.default.permitted.paths += /product/framework
namespace.default.permitted.paths += /product/app
namespace.default.permitted.paths += /product/priv-app
+namespace.default.permitted.paths += /system/product/framework
+namespace.default.permitted.paths += /system/product/app
+namespace.default.permitted.paths += /system/product/priv-app
namespace.default.permitted.paths += /data
namespace.default.permitted.paths += /mnt/expand
@@ -92,6 +96,10 @@ namespace.default.asan.permitted.paths += /product/${LIB}
namespace.default.asan.permitted.paths += /product/framework
namespace.default.asan.permitted.paths += /product/app
namespace.default.asan.permitted.paths += /product/priv-app
+namespace.default.asan.permitted.paths += /system/product/${LIB}
+namespace.default.asan.permitted.paths += /system/product/framework
+namespace.default.asan.permitted.paths += /system/product/app
+namespace.default.asan.permitted.paths += /system/product/priv-app
namespace.default.asan.permitted.paths += /mnt/expand
###############################################################################