Remove mediametrics include symlinks

Bug: 143245419 Test: build Change-Id: I6c836e60c0fe078f5ab7370aec156bdd6e8dcbf0
5 years ago · 7c96ea7ff8
parent 255f610f5a
commit 7c96ea7ff8
21 changed files with 49 additions and 6 deletions
--- a/cmds/screenrecord/Android.bp
+++ b/cmds/screenrecord/Android.bp
@ -26,6 +26,7 @@ cc_binary {

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

    shared_libs: [
--- a/cmds/stagefright/Android.mk
+++ b/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
--- a/drm/libmediadrm/Android.bp
+++ b/drm/libmediadrm/Android.bp
@ -167,6 +167,7 @@ cc_library_shared {
    ],

    header_libs: [
+        "libmediametrics_headers",
        "libstagefright_foundation_headers",
    ],
 }
--- a/drm/libmediadrm/tests/Android.bp
+++ b/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",
--- a/include/media/IMediaMetricsService.h
+++ b/include/media/IMediaMetricsService.h
@ -1 +0,0 @@
-../../media/libmediametrics/include/IMediaMetricsService.h
--- a/include/media/MediaMetrics.h
+++ b/include/media/MediaMetrics.h
@ -1 +0,0 @@
-../../media/libmediametrics/include/MediaMetrics.h
--- a/include/media/MediaMetricsItem.h
+++ b/include/media/MediaMetricsItem.h
@ -1 +0,0 @@
-../../media/libmediametrics/include/MediaMetricsItem.h
--- a/media/audioserver/Android.mk
+++ b/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 := \
--- a/media/codec2/sfplugin/Android.bp
+++ b/media/codec2/sfplugin/Android.bp
@ -23,6 +23,7 @@ cc_library_shared {
    header_libs: [
        "libcodec2_internal",
        "libmediadrm_headers",
+        "libmediametrics_headers",
        "media_ndk_headers",
    ],

--- a/media/codec2/sfplugin/tests/Android.bp
+++ b/media/codec2/sfplugin/tests/Android.bp
@ -35,6 +35,7 @@ cc_test {

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

    shared_libs: [
--- a/media/libaaudio/src/Android.bp
+++ b/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"],

--- a/media/libaudioclient/tests/Android.bp
+++ b/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",
--- a/media/libmediametrics/Android.bp
+++ b/media/libmediametrics/Android.bp
@ -1,3 +1,8 @@
+cc_library_headers {
+    name: "libmediametrics_headers",
+    export_include_dirs: ["include"],
+}
+
 cc_library_shared {
    name: "libmediametrics",

--- a/media/libmediametrics/include/media/IMediaMetricsService.h
+++ b/media/libmediametrics/include/media/IMediaMetricsService.h
--- a/media/libmediametrics/include/media/MediaMetrics.h
+++ b/media/libmediametrics/include/media/MediaMetrics.h
--- a/media/libmediametrics/include/media/MediaMetricsItem.h
+++ b/media/libmediametrics/include/media/MediaMetricsItem.h
--- a/media/libmediaplayerservice/nuplayer/Android.bp
+++ b/media/libmediaplayerservice/nuplayer/Android.bp
@ -19,6 +19,7 @@ cc_library_static {

    header_libs: [
        "libmediadrm_headers",
+        "libmediametrics_headers",
        "media_plugin_headers",
    ],

--- a/media/ndk/Android.bp
+++ b/media/ndk/Android.bp
@ -72,6 +72,7 @@ cc_library_shared {

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

    shared_libs: [
--- a/services/camera/libcameraservice/Android.bp
+++ b/services/camera/libcameraservice/Android.bp
@ -75,7 +75,8 @@ cc_library_shared {
    ],

    header_libs: [
-        "libmediadrm_headers"
+        "libmediadrm_headers",
+        "libmediametrics_headers",
    ],

    shared_libs: [
--- a/services/mediaextractor/Android.bp
+++ b/services/mediaextractor/Android.bp
@ -15,6 +15,9 @@ cc_library_shared {
        "libutils",
        "liblog",
    ],
+    header_libs: [
+        "libmediametrics_headers",
+    ],
 }

 // service executable
--- a/services/mediametrics/Android.bp
+++ b/services/mediametrics/Android.bp
@ -15,6 +15,9 @@ cc_binary {
        "libmediautils",
        "libutils",
    ],
+    header_libs: [
+        "libmediametrics_headers",
+    ],

    init_rc: [
        "mediametrics.rc",
				`@ -1 +0,0 @@`
				`../../media/libmediametrics/include/IMediaMetricsService.h`
				`@ -1 +0,0 @@`
				`../../media/libmediametrics/include/MediaMetrics.h`