Merge "Don't link with mediametrics headers symlinks"

2020-01-25 03:44:29 +00:00
parent b83a44dcd9 25f8348cc7
commit 06b1d0629d
3 changed files with 9 additions and 0 deletions
--- a/media/jni/soundpool/Android.bp
+++ b/media/jni/soundpool/Android.bp
@@ -13,6 +13,7 @@ cc_library_shared {

    header_libs: [
        "libmedia_headers",
+        "libmediametrics_headers",
    ],

    shared_libs: [
--- a/media/jni/soundpool/tests/Android.bp
+++ b/media/jni/soundpool/tests/Android.bp
@@ -16,6 +16,10 @@ cc_binary {
        "libutils",
    ],

+    header_libs: [
+        "libmediametrics_headers",
+    ],
+
    srcs: [
        "soundpool_stress.cpp"
    ],
--- a/media/tests/audiotests/Android.bp
+++ b/media/tests/audiotests/Android.bp
@@ -14,6 +14,10 @@ cc_test {
        "libaudioclient",
    ],

+    header_libs: [
+        "libmediametrics_headers",
+    ],
+
    cflags: [
        "-Wall",
        "-Werror",