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

Commit 963685ed authored by Jiyong Park's avatar Jiyong Park Committed by android-build-merger
Browse files

Merge "Do not use versioned VNDK directory in vendor partition" am: 3459e582 

am: c56fafa4

Change-Id: I246264682f84fcf61fe7b58fb505a930ef76572b
parents d5637c54 c56fafa4

rootdir/etc/ld.config.txt

+24 −24
Original line number Diff line number Diff line
@@ -126,8 +126,8 @@ namespace.sphal.link.rs.shared_libs = libRS_internal.so 
namespace.rs.isolated = true

namespace.rs.visible = true



namespace.rs.search.paths  = /odm/${LIB}/vndk-sp${VNDK_VER}

namespace.rs.search.paths += /vendor/${LIB}/vndk-sp${VNDK_VER}

namespace.rs.search.paths  = /odm/${LIB}/vndk-sp

namespace.rs.search.paths += /vendor/${LIB}/vndk-sp

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

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

namespace.rs.search.paths += /vendor/${LIB}
@@ -136,10 +136,10 @@ namespace.rs.permitted.paths = /odm/${LIB} 
namespace.rs.permitted.paths += /vendor/${LIB}

namespace.rs.permitted.paths += /data



namespace.rs.asan.search.paths  = /data/asan/odm/${LIB}/vndk-sp${VNDK_VER}

namespace.rs.asan.search.paths +=           /odm/${LIB}/vndk-sp${VNDK_VER}

namespace.rs.asan.search.paths += /data/asan/vendor/${LIB}/vndk-sp${VNDK_VER}

namespace.rs.asan.search.paths +=           /vendor/${LIB}/vndk-sp${VNDK_VER}

namespace.rs.asan.search.paths  = /data/asan/odm/${LIB}/vndk-sp

namespace.rs.asan.search.paths +=           /odm/${LIB}/vndk-sp

namespace.rs.asan.search.paths += /data/asan/vendor/${LIB}/vndk-sp

namespace.rs.asan.search.paths +=           /vendor/${LIB}/vndk-sp

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

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

namespace.rs.asan.search.paths += /data/asan/odm/${LIB}
@@ -196,8 +196,8 @@ namespace.rs.link.vndk.shared_libs += libutils.so 
namespace.vndk.isolated = true

namespace.vndk.visible = true



namespace.vndk.search.paths  = /odm/${LIB}/vndk-sp${VNDK_VER}

namespace.vndk.search.paths += /vendor/${LIB}/vndk-sp${VNDK_VER}

namespace.vndk.search.paths  = /odm/${LIB}/vndk-sp

namespace.vndk.search.paths += /vendor/${LIB}/vndk-sp

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



namespace.vndk.permitted.paths  = /odm/${LIB}/hw
@@ -205,10 +205,10 @@ namespace.vndk.permitted.paths += /odm/${LIB}/egl 
namespace.vndk.permitted.paths += /vendor/${LIB}/hw

namespace.vndk.permitted.paths += /vendor/${LIB}/egl



namespace.vndk.asan.search.paths  = /data/asan/odm/${LIB}/vndk-sp${VNDK_VER}

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

namespace.vndk.asan.search.paths += /data/asan/vendor/${LIB}/vndk-sp${VNDK_VER}

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

namespace.vndk.asan.search.paths  = /data/asan/odm/${LIB}/vndk-sp

namespace.vndk.asan.search.paths +=           /odm/${LIB}/vndk-sp

namespace.vndk.asan.search.paths += /data/asan/vendor/${LIB}/vndk-sp

namespace.vndk.asan.search.paths +=           /vendor/${LIB}/vndk-sp

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

namespace.vndk.asan.search.paths +=           /system/${LIB}/vndk-sp${VNDK_VER}
@@ -247,11 +247,11 @@ namespace.vndk.link.default.shared_libs += libz.so 
namespace.default.isolated = false



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

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

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

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

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

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

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

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

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

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



# Access to system libraries are allowed

namespace.default.search.paths += /system/${LIB}/vndk${VNDK_VER}
@@ -265,16 +265,16 @@ namespace.default.search.paths += /vendor/${LIB}/hw 


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

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

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

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

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

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

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

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

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

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

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

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

namespace.default.asan.search.paths += /data/asan/vendor/${LIB}/vndk${VNDK_VER}

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

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

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

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

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

namespace.default.asan.search.paths += /data/asan/vendor/${LIB}/vndk-sp

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

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

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

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

rootdir/etc/ld.config.txt.in

+24 −24
Original line number Diff line number Diff line
@@ -129,8 +129,8 @@ namespace.sphal.link.rs.shared_libs = libRS_internal.so 
namespace.rs.isolated = true

namespace.rs.visible = true



namespace.rs.search.paths  = /odm/${LIB}/vndk-sp${VNDK_VER}

namespace.rs.search.paths += /vendor/${LIB}/vndk-sp${VNDK_VER}

namespace.rs.search.paths  = /odm/${LIB}/vndk-sp

namespace.rs.search.paths += /vendor/${LIB}/vndk-sp

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

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

namespace.rs.search.paths += /vendor/${LIB}
@@ -139,10 +139,10 @@ namespace.rs.permitted.paths = /odm/${LIB} 
namespace.rs.permitted.paths += /vendor/${LIB}

namespace.rs.permitted.paths += /data



namespace.rs.asan.search.paths  = /data/asan/odm/${LIB}/vndk-sp${VNDK_VER}

namespace.rs.asan.search.paths +=           /odm/${LIB}/vndk-sp${VNDK_VER}

namespace.rs.asan.search.paths += /data/asan/vendor/${LIB}/vndk-sp${VNDK_VER}

namespace.rs.asan.search.paths +=           /vendor/${LIB}/vndk-sp${VNDK_VER}

namespace.rs.asan.search.paths  = /data/asan/odm/${LIB}/vndk-sp

namespace.rs.asan.search.paths +=           /odm/${LIB}/vndk-sp

namespace.rs.asan.search.paths += /data/asan/vendor/${LIB}/vndk-sp

namespace.rs.asan.search.paths +=           /vendor/${LIB}/vndk-sp

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

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

namespace.rs.asan.search.paths += /data/asan/odm/${LIB}
@@ -174,8 +174,8 @@ namespace.rs.link.vndk.shared_libs = %VNDK_SAMEPROCESS_LIBRARIES% 
namespace.vndk.isolated = true

namespace.vndk.visible = true



namespace.vndk.search.paths  = /odm/${LIB}/vndk-sp${VNDK_VER}

namespace.vndk.search.paths += /vendor/${LIB}/vndk-sp${VNDK_VER}

namespace.vndk.search.paths  = /odm/${LIB}/vndk-sp

namespace.vndk.search.paths += /vendor/${LIB}/vndk-sp

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



namespace.vndk.permitted.paths  = /odm/${LIB}/hw
@@ -185,10 +185,10 @@ namespace.vndk.permitted.paths += /vendor/${LIB}/egl 
# This is exceptionally required since android.hidl.memory@1.0-impl.so is here

namespace.vndk.permitted.paths += /system/${LIB}/vndk-sp${VNDK_VER}/hw



namespace.vndk.asan.search.paths  = /data/asan/odm/${LIB}/vndk-sp${VNDK_VER}

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

namespace.vndk.asan.search.paths += /data/asan/vendor/${LIB}/vndk-sp${VNDK_VER}

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

namespace.vndk.asan.search.paths  = /data/asan/odm/${LIB}/vndk-sp

namespace.vndk.asan.search.paths +=           /odm/${LIB}/vndk-sp

namespace.vndk.asan.search.paths += /data/asan/vendor/${LIB}/vndk-sp

namespace.vndk.asan.search.paths +=           /vendor/${LIB}/vndk-sp

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

namespace.vndk.asan.search.paths +=           /system/${LIB}/vndk-sp${VNDK_VER}
@@ -234,11 +234,11 @@ namespace.default.isolated = true 
namespace.default.visible = true



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

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

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

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

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

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

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

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

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

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



# TODO(b/70551668) remove this

namespace.default.search.paths += /vendor/${LIB}/hw
@@ -248,16 +248,16 @@ namespace.default.permitted.paths += /vendor 


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

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

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

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

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

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

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

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

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

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

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

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

namespace.default.asan.search.paths += /data/asan/vendor/${LIB}/vndk${VNDK_VER}

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

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

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

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

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

namespace.default.asan.search.paths += /data/asan/vendor/${LIB}/vndk-sp

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



# TODO(b/70551668) remove this

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