ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Support product partition for non-treblized devices" am: 79bd67bb2f

Browse source 
am: 7a6df0832a

Change-Id: I6000af149381854d1095f42a99f9a3375a9036d6
This commit is contained in:
changho.shin 2018-11-30 00:41:26 -08:00 • committed by android-build-merger
commit b1c845d003
1 changed files with 13 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
rootdir/etc/ld.config.legacy.txt
View file

@ -6,35 +6,40 @@
# All binaries gets the same configuration 'legacy' # All binaries gets the same configuration 'legacy'
dir.legacy = /system dir.legacy = /system
dir.legacy = /product
dir.legacy = /vendor dir.legacy = /vendor
dir.legacy = /odm dir.legacy = /odm
dir.legacy = /sbin dir.legacy = /sbin
# Except for /postinstall, where only /system is searched # Except for /postinstall, where only /system and /product are searched
dir.postinstall = /postinstall dir.postinstall = /postinstall
[legacy] [legacy]
namespace.default.isolated = false namespace.default.isolated = false
namespace.default.search.paths = /system/${LIB} namespace.default.search.paths = /system/${LIB}
namespace.default.search.paths += /product/${LIB}
namespace.default.search.paths += /vendor/${LIB} namespace.default.search.paths += /vendor/${LIB}
namespace.default.search.paths += /odm/${LIB} namespace.default.search.paths += /odm/${LIB}
namespace.default.asan.search.paths = /data/asan/system/${LIB} namespace.default.asan.search.paths = /data/asan/system/${LIB}
namespace.default.asan.search.paths += /system/${LIB} namespace.default.asan.search.paths += /system/${LIB}
namespace.default.asan.search.paths += /data/asan/odm/${LIB} namespace.default.asan.search.paths += /data/asan/product/${LIB}
namespace.default.asan.search.paths += /odm/${LIB} namespace.default.asan.search.paths += /product/${LIB}
namespace.default.asan.search.paths += /data/asan/vendor/${LIB} namespace.default.asan.search.paths += /data/asan/vendor/${LIB}
namespace.default.asan.search.paths += /vendor/${LIB} namespace.default.asan.search.paths += /vendor/${LIB}
namespace.default.asan.search.paths += /data/asan/odm/${LIB}
namespace.default.asan.search.paths += /odm/${LIB}
############################################################################### ###############################################################################
# Namespace config for binaries under /postinstall. # Namespace config for binaries under /postinstall.
# Only one default namespace is defined and it has no directories other than # Only one default namespace is defined and it has no directories other than
# /system/lib in the search paths. This is because linker calls realpath on the # /system/lib and /product/lib in the search paths. This is because linker
# search paths and this causes selinux denial if the paths (/vendor, /odm) are # calls realpath on the search paths and this causes selinux denial if the
# not allowed to the poinstall binaries. There is no reason to allow the # paths (/vendor, /odm) are not allowed to the poinstall binaries.
# binaries to access the paths. # There is no reason to allow the binaries to access the paths.
############################################################################### ###############################################################################
[postinstall] [postinstall]
namespace.default.isolated = false namespace.default.isolated = false
namespace.default.search.paths = /system/${LIB} namespace.default.search.paths = /system/${LIB}
namespace.default.search.paths += /product/${LIB}