commit 25f8348cc7fdbabae3dc91d4866a9103a78566f4
author Marco Nelissen <marcone@google.com> Fri Jan 10 16:31:30 2020 -0800
committer Marco Nelissen <marcone@google.com> Thu Jan 16 15:55:57 2020 -0800
tree 41317cd8ed4de11482b3a65181e7fe422506677e
parent 9d7d82645ab7f8e731f7ac8bd5db29f44ba0606f

Don't link with mediametrics headers symlinks

Bug: 143245419
Test: build
Change-Id: Id0a76cb571812168ca277aef6ff02d5aead266ca

media/jni/soundpool/Android.bp

diff --git a/media/jni/soundpool/Android.bp b/media/jni/soundpool/Android.bp
index 0be2514..aa32793 100644
--- a/media/jni/soundpool/Android.bp
+++ b/media/jni/soundpool/Android.bp
@@ -13,6 +13,7 @@
 
     header_libs: [
         "libmedia_headers",
+        "libmediametrics_headers",
     ],
 
     shared_libs: [

media/jni/soundpool/tests/Android.bp

diff --git a/media/jni/soundpool/tests/Android.bp b/media/jni/soundpool/tests/Android.bp
index 96ec4e5..52f59ed 100644
--- a/media/jni/soundpool/tests/Android.bp
+++ b/media/jni/soundpool/tests/Android.bp
@@ -16,6 +16,10 @@
         "libutils",
     ],
 
+    header_libs: [
+        "libmediametrics_headers",
+    ],
+
     srcs: [
         "soundpool_stress.cpp"
     ],

media/tests/audiotests/Android.bp

diff --git a/media/tests/audiotests/Android.bp b/media/tests/audiotests/Android.bp
index 8ef7694..5db0ab0 100644
--- a/media/tests/audiotests/Android.bp
+++ b/media/tests/audiotests/Android.bp
@@ -14,6 +14,10 @@
         "libaudioclient",
     ],
 
+    header_libs: [
+        "libmediametrics_headers",
+    ],
+
     cflags: [
         "-Wall",
         "-Werror",