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

Commit bc60897a authored by Nicolas Geoffray's avatar Nicolas Geoffray Committed by android-build-merger
Browse files

Merge "Add 'media' namespace in ld.config.txt" am: 7fa20386 

am: f495d922

Change-Id: I1f1fb3a04d2acc89a5c9035dbe8c4290e09842f7
parents 36390439 f495d922

rootdir/etc/ld.config.txt

+17 −1
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ dir.system = /data/benchmarktest64 
dir.postinstall = /postinstall



[system]

additional.namespaces = runtime,sphal,vndk,rs

additional.namespaces = runtime,media,sphal,vndk,rs



###############################################################################

# "default" namespace
@@ -128,6 +128,22 @@ namespace.runtime.links = default 
# when it exists.

namespace.runtime.link.default.allow_all_shared_libs = true



###############################################################################

# "media" APEX namespace

#

# This namespace is for libraries within the media APEX.

###############################################################################

namespace.media.isolated = true

namespace.media.visible = true



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



namespace.media.links = default

namespace.media.link.default.shared_libs  = %LLNDK_LIBRARIES%

namespace.media.link.default.shared_libs += libandroid.so

namespace.media.link.default.shared_libs += libbinder_ndk.so

namespace.media.link.default.shared_libs += %SANITIZER_RUNTIME_LIBRARIES%



###############################################################################

# "sphal" namespace

#

rootdir/etc/ld.config.vndk_lite.txt

+17 −1
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ dir.system = /data/benchmarktest64 
dir.postinstall = /postinstall



[system]

additional.namespaces = runtime,sphal,vndk,rs

additional.namespaces = runtime,media,sphal,vndk,rs



###############################################################################

# "default" namespace
@@ -75,6 +75,22 @@ namespace.runtime.links = default 
# when it exists.

namespace.runtime.link.default.allow_all_shared_libs = true



###############################################################################

# "media" APEX namespace

#

# This namespace is for libraries within the media APEX.

###############################################################################

namespace.media.isolated = true

namespace.media.visible = true



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



namespace.media.links = default

namespace.media.link.default.shared_libs  = %LLNDK_LIBRARIES%

namespace.media.link.default.shared_libs += libandroid.so

namespace.media.link.default.shared_libs += libbinder_ndk.so

namespace.media.link.default.shared_libs += %SANITIZER_RUNTIME_LIBRARIES%



###############################################################################

# "sphal" namespace

#