Remove mediametrics include symlinks

Bug: 143245419
Test: build
Change-Id: I6c836e60c0fe078f5ab7370aec156bdd6e8dcbf0

cmds/screenrecord/Android.bp

@@ -26,6 +26,7 @@ cc_binary {
 
     header_libs: [
         "libmediadrm_headers",
+        "libmediametrics_headers",
     ],
 
     shared_libs: [

cmds/stagefright/Android.mk

@@ -8,6 +8,9 @@ LOCAL_SRC_FILES:=       \
         jpeg.cpp        \
         SineSource.cpp
 
+LOCAL_HEADER_LIBRARIES := \
+        libmediametrics_headers \
+
 LOCAL_SHARED_LIBRARIES := \
         libstagefright libmedia libmedia_codeclist libutils libbinder \
         libstagefright_foundation libjpeg libui libgui libcutils liblog \
@@ -37,6 +40,9 @@ LOCAL_SRC_FILES:=         \
         SineSource.cpp    \
         record.cpp
 
+LOCAL_HEADER_LIBRARIES := \
+        libmediametrics_headers \
+
 LOCAL_SHARED_LIBRARIES := \
         libstagefright libmedia liblog libutils libbinder \
         libstagefright_foundation libdatasource libaudioclient
@@ -63,6 +69,9 @@ LOCAL_SRC_FILES:=         \
         AudioPlayer.cpp \
         recordvideo.cpp
 
+LOCAL_HEADER_LIBRARIES := \
+        libmediametrics_headers \
+
 LOCAL_SHARED_LIBRARIES := \
         libstagefright libmedia liblog libutils libbinder \
         libstagefright_foundation libaudioclient
@@ -90,6 +99,9 @@ LOCAL_SRC_FILES:=         \
         SineSource.cpp    \
         audioloop.cpp
 
+LOCAL_HEADER_LIBRARIES := \
+        libmediametrics_headers \
+
 LOCAL_SHARED_LIBRARIES := \
         libstagefright libmedia liblog libutils libbinder \
         libstagefright_foundation libaudioclient
@@ -113,6 +125,9 @@ include $(CLEAR_VARS)
 LOCAL_SRC_FILES:=         \
         stream.cpp    \
 
+LOCAL_HEADER_LIBRARIES := \
+        libmediametrics_headers \
+
 LOCAL_SHARED_LIBRARIES := \
         libstagefright liblog libutils libbinder libui libgui \
         libstagefright_foundation libmedia libcutils libdatasource
@@ -139,6 +154,7 @@ LOCAL_SRC_FILES:=               \
 
 LOCAL_HEADER_LIBRARIES := \
         libmediadrm_headers \
+        libmediametrics_headers \
 
 LOCAL_SHARED_LIBRARIES := \
         libstagefright liblog libutils libbinder libstagefright_foundation \
@@ -168,6 +184,7 @@ LOCAL_SRC_FILES:= \
 
 LOCAL_HEADER_LIBRARIES := \
         libmediadrm_headers \
+        libmediametrics_headers \
 
 LOCAL_SHARED_LIBRARIES := \
         libstagefright \
@@ -209,6 +226,9 @@ include $(CLEAR_VARS)
 LOCAL_SRC_FILES:=               \
         muxer.cpp            \
 
+LOCAL_HEADER_LIBRARIES := \
+        libmediametrics_headers \
+
 LOCAL_SHARED_LIBRARIES := \
         libstagefright liblog libutils libbinder libstagefright_foundation \
         libcutils libc

drm/libmediadrm/Android.bp

@@ -167,6 +167,7 @@ cc_library_shared {
     ],
 
     header_libs: [
+        "libmediametrics_headers",
         "libstagefright_foundation_headers",
     ],
 }

drm/libmediadrm/tests/Android.bp

@@ -3,7 +3,10 @@
 cc_test {
     name: "CounterMetric_test",
     srcs: ["CounterMetric_test.cpp"],
-    header_libs: ["libmedia_headers"],
+    header_libs: [
+        "libmedia_headers",
+        "libmediametrics_headers",
+    ],
     shared_libs: ["libmediadrm"],
     cflags: [
       "-Werror",
@@ -46,7 +49,8 @@ cc_test {
     name: "EventMetric_test",
     srcs: ["EventMetric_test.cpp"],
     header_libs: [
-        "libmedia_headers"
+        "libmedia_headers",
+        "libmediametrics_headers",
     ],
     shared_libs: [
       "liblog",

include/media/IMediaMetricsService.h

@@ -1 +0,0 @@
-../../media/libmediametrics/include/IMediaMetricsService.h

include/media/MediaMetrics.h

@@ -1 +0,0 @@
-../../media/libmediametrics/include/MediaMetrics.h

include/media/MediaMetricsItem.h

@@ -1 +0,0 @@
-../../media/libmediametrics/include/MediaMetricsItem.h

media/audioserver/Android.mk

@@ -24,6 +24,7 @@ LOCAL_SHARED_LIBRARIES := \
 
 LOCAL_HEADER_LIBRARIES := \
 	libaudiohal_headers \
+	libmediametrics_headers \
 
 # TODO oboeservice is the old folder name for aaudioservice. It will be changed.
 LOCAL_C_INCLUDES := \

media/codec2/sfplugin/Android.bp

@@ -23,6 +23,7 @@ cc_library_shared {
     header_libs: [
         "libcodec2_internal",
         "libmediadrm_headers",
+        "libmediametrics_headers",
         "media_ndk_headers",
     ],
 

media/codec2/sfplugin/tests/Android.bp

@@ -35,6 +35,7 @@ cc_test {
 
     header_libs: [
         "libmediadrm_headers",
+        "libmediametrics_headers",
     ],
 
     shared_libs: [

media/libaaudio/src/Android.bp

@@ -76,6 +76,7 @@ cc_library {
     header_libs: [
         "libaaudio_headers",
         "libmedia_headers",
+        "libmediametrics_headers",
     ],
     export_header_lib_headers: ["libaaudio_headers"],
 

media/libaudioclient/tests/Android.bp

@@ -13,6 +13,7 @@ cc_test {
            "test_create_utils.cpp"],
     header_libs: [
         "libmedia_headers",
+        "libmediametrics_headers",
     ],
     shared_libs: [
         "libaudioclient",
@@ -30,6 +31,7 @@ cc_test {
            "test_create_utils.cpp"],
     header_libs: [
         "libmedia_headers",
+        "libmediametrics_headers",
     ],
     shared_libs: [
         "libaudioclient",

media/libmediametrics/Android.bp

@@ -1,3 +1,8 @@
+cc_library_headers {
+    name: "libmediametrics_headers",
+    export_include_dirs: ["include"],
+}
+
 cc_library_shared {
     name: "libmediametrics",
 

media/libmediaplayerservice/nuplayer/Android.bp

@@ -19,6 +19,7 @@ cc_library_static {
 
     header_libs: [
         "libmediadrm_headers",
+        "libmediametrics_headers",
         "media_plugin_headers",
     ],
 

media/ndk/Android.bp

@@ -72,6 +72,7 @@ cc_library_shared {
 
     header_libs: [
         "libmediadrm_headers",
+        "libmediametrics_headers",
     ],
 
     shared_libs: [

services/camera/libcameraservice/Android.bp

@@ -75,7 +75,8 @@ cc_library_shared {
     ],
 
     header_libs: [
-        "libmediadrm_headers"
+        "libmediadrm_headers",
+        "libmediametrics_headers",
     ],
 
     shared_libs: [

services/mediaextractor/Android.bp

@@ -15,6 +15,9 @@ cc_library_shared {
         "libutils",
         "liblog",
     ],
+    header_libs: [
+        "libmediametrics_headers",
+    ],
 }
 
 // service executable

services/mediametrics/Android.bp

@@ -15,6 +15,9 @@ cc_binary {
         "libmediautils",
         "libutils",
     ],
+    header_libs: [
+        "libmediametrics_headers",
+    ],
 
     init_rc: [
         "mediametrics.rc",