commit 4c135fabc7a226e0f228d2bbe4fefa513e9095d8
author Ray Essick <essick@google.com> Fri Jan 25 00:41:02 2019 -0800
committer android-build-merger <android-build-merger@google.com> Fri Jan 25 00:41:02 2019 -0800
tree a70ac5b88804a5fc105e63d8b45dbc2fe3939f53
parent 036080a9115100d30790406ad0cd4b957436db39
parent 7f8e57973573a0909a84fe4ecae2af89fbf7513f

Merge "give media apex access to libmediametrics" am: 6a92b5c9c3
am: 8123770797

Change-Id: Idc9e3f86fa11ee2e76a5d7c15ab30e6bf2ab552c

rootdir/etc/ld.config.txt

diff --git a/rootdir/etc/ld.config.txt b/rootdir/etc/ld.config.txt
index 54e7c7e..4e2af86 100644
--- a/rootdir/etc/ld.config.txt
+++ b/rootdir/etc/ld.config.txt
@@ -148,6 +148,7 @@
 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 += libmediametrics.so
 namespace.media.link.default.shared_libs += %SANITIZER_RUNTIME_LIBRARIES%
 
 ###############################################################################

rootdir/etc/ld.config.vndk_lite.txt

diff --git a/rootdir/etc/ld.config.vndk_lite.txt b/rootdir/etc/ld.config.vndk_lite.txt
index 39f69ca..335369e 100644
--- a/rootdir/etc/ld.config.vndk_lite.txt
+++ b/rootdir/etc/ld.config.vndk_lite.txt
@@ -97,6 +97,7 @@
 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 += libmediametrics.so
 namespace.media.link.default.shared_libs += %SANITIZER_RUNTIME_LIBRARIES%
 
 ###############################################################################