Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2f56b1ff authored by Roland Levillain's avatar Roland Levillain
Browse files

Add Android Runtime APEX lib directories to the system linker configuration. 

Test: Device boot test with Android Runtime APEX.
Test: Device boot test without Android Runtime APEX.
Bug: 113373927
Change-Id: Iff32fcd79a667b07df839f4e6ef2cdb3cf70e9d3
parent 66a6d887

rootdir/etc/ld.config.txt

+8 −3
Original line number Diff line number Diff line
@@ -38,7 +38,8 @@ additional.namespaces = sphal,vndk,rs 
###############################################################################

namespace.default.isolated = true



namespace.default.search.paths  = /system/${LIB}

namespace.default.search.paths  = /apex/com.android.runtime/${LIB}

namespace.default.search.paths += /system/${LIB}

namespace.default.search.paths += /%PRODUCT%/${LIB}

namespace.default.search.paths += /%PRODUCT_SERVICES%/${LIB}
@@ -75,6 +76,7 @@ namespace.default.permitted.paths += /data 
namespace.default.permitted.paths += /mnt/expand



namespace.default.asan.search.paths  = /data/asan/system/${LIB}

namespace.default.asan.search.paths += /apex/com.android.runtime/${LIB}

namespace.default.asan.search.paths +=           /system/${LIB}

namespace.default.asan.search.paths += /data/asan/product/${LIB}

namespace.default.asan.search.paths +=           /%PRODUCT%/${LIB}
@@ -337,11 +339,13 @@ namespace.vndk.link.default.allow_all_shared_libs = true 
###############################################################################

namespace.system.isolated = false



namespace.system.search.paths  = /system/${LIB}

namespace.system.search.paths  = /apex/com.android.runtime/${LIB}

namespace.system.search.paths += /system/${LIB}

namespace.system.search.paths += /%PRODUCT%/${LIB}

namespace.system.search.paths += /%PRODUCT_SERVICES%/${LIB}



namespace.system.asan.search.paths  = /data/asan/system/${LIB}

namespace.system.asan.search.paths += /apex/com.android.runtime/${LIB}

namespace.system.asan.search.paths +=           /system/${LIB}

namespace.system.asan.search.paths += /data/asan/product/${LIB}

namespace.system.asan.search.paths +=           /%PRODUCT%/${LIB}
@@ -358,6 +362,7 @@ namespace.system.asan.search.paths += /%PRODUCT_SERVICES%/${LIB} 
###############################################################################

[postinstall]

namespace.default.isolated = false

namespace.default.search.paths  = /system/${LIB}

namespace.default.search.paths  = /apex/com.android.runtime/${LIB}

namespace.default.search.paths += /system/${LIB}

namespace.default.search.paths += /%PRODUCT%/${LIB}

namespace.default.search.paths += /%PRODUCT_SERVICES%/${LIB}

rootdir/etc/ld.config.vndk_lite.txt

+7 −2
Original line number Diff line number Diff line
@@ -38,13 +38,15 @@ additional.namespaces = sphal,vndk,rs 
###############################################################################

namespace.default.isolated = false



namespace.default.search.paths  = /system/${LIB}

namespace.default.search.paths  = /apex/com.android.runtime/${LIB}

namespace.default.search.paths += /system/${LIB}

namespace.default.search.paths += /odm/${LIB}

namespace.default.search.paths += /vendor/${LIB}

namespace.default.search.paths += /%PRODUCT%/${LIB}

namespace.default.search.paths += /%PRODUCT_SERVICES%/${LIB}



namespace.default.asan.search.paths  = /data/asan/system/${LIB}

namespace.default.asan.search.paths += /apex/com.android.runtime/${LIB}

namespace.default.asan.search.paths +=           /system/${LIB}

namespace.default.asan.search.paths += /data/asan/odm/${LIB}

namespace.default.asan.search.paths +=           /odm/${LIB}
@@ -211,6 +213,7 @@ namespace.default.search.paths += /vendor/${LIB}/vndk-sp 
# Access to system libraries are allowed

namespace.default.search.paths += /system/${LIB}/vndk%VNDK_VER%

namespace.default.search.paths += /system/${LIB}/vndk-sp%VNDK_VER%

namespace.default.search.paths += /apex/com.android.runtime/${LIB}

namespace.default.search.paths += /system/${LIB}

namespace.default.search.paths += /%PRODUCT%/${LIB}

namespace.default.search.paths += /%PRODUCT_SERVICES%/${LIB}
@@ -232,6 +235,7 @@ namespace.default.asan.search.paths += /system/${LIB}/vndk%VNDK_VER% 
namespace.default.asan.search.paths += /data/asan/system/${LIB}/vndk-sp%VNDK_VER%

namespace.default.asan.search.paths +=           /system/${LIB}/vndk-sp%VNDK_VER%

namespace.default.asan.search.paths += /data/asan/system/${LIB}

namespace.default.asan.search.paths += /apex/com.android.runtime/${LIB}

namespace.default.asan.search.paths +=           /system/${LIB}

namespace.default.asan.search.paths += /data/asan/product/${LIB}

namespace.default.asan.search.paths +=           /%PRODUCT%/${LIB}
@@ -248,6 +252,7 @@ namespace.default.asan.search.paths += /%PRODUCT_SERVICES%/${LIB} 
###############################################################################

[postinstall]

namespace.default.isolated = false

namespace.default.search.paths  = /system/${LIB}

namespace.default.search.paths  = /apex/com.android.runtime/${LIB}

namespace.default.search.paths += /system/${LIB}

namespace.default.search.paths += /%PRODUCT%/${LIB}

namespace.default.search.paths += /%PRODUCT_SERVICES%/${LIB}