Remove mediametrics include symlinks
Bug: 143245419
Test: build
Change-Id: I6c836e60c0fe078f5ab7370aec156bdd6e8dcbf0
diff --git a/cmds/screenrecord/Android.bp b/cmds/screenrecord/Android.bp
index 72008c2..d7d905f 100644
--- a/cmds/screenrecord/Android.bp
+++ b/cmds/screenrecord/Android.bp
@@ -26,6 +26,7 @@
header_libs: [
"libmediadrm_headers",
+ "libmediametrics_headers",
],
shared_libs: [
diff --git a/cmds/stagefright/Android.mk b/cmds/stagefright/Android.mk
index 7b447d3..6470fb1 100644
--- a/cmds/stagefright/Android.mk
+++ b/cmds/stagefright/Android.mk
@@ -8,6 +8,9 @@
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 @@
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 @@
AudioPlayer.cpp \
recordvideo.cpp
+LOCAL_HEADER_LIBRARIES := \
+ libmediametrics_headers \
+
LOCAL_SHARED_LIBRARIES := \
libstagefright libmedia liblog libutils libbinder \
libstagefright_foundation libaudioclient
@@ -90,6 +99,9 @@
SineSource.cpp \
audioloop.cpp
+LOCAL_HEADER_LIBRARIES := \
+ libmediametrics_headers \
+
LOCAL_SHARED_LIBRARIES := \
libstagefright libmedia liblog libutils libbinder \
libstagefright_foundation libaudioclient
@@ -113,6 +125,9 @@
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_HEADER_LIBRARIES := \
libmediadrm_headers \
+ libmediametrics_headers \
LOCAL_SHARED_LIBRARIES := \
libstagefright liblog libutils libbinder libstagefright_foundation \
@@ -168,6 +184,7 @@
LOCAL_HEADER_LIBRARIES := \
libmediadrm_headers \
+ libmediametrics_headers \
LOCAL_SHARED_LIBRARIES := \
libstagefright \
@@ -209,6 +226,9 @@
LOCAL_SRC_FILES:= \
muxer.cpp \
+LOCAL_HEADER_LIBRARIES := \
+ libmediametrics_headers \
+
LOCAL_SHARED_LIBRARIES := \
libstagefright liblog libutils libbinder libstagefright_foundation \
libcutils libc
diff --git a/drm/libmediadrm/Android.bp b/drm/libmediadrm/Android.bp
index 255640f..6ba1b9c 100644
--- a/drm/libmediadrm/Android.bp
+++ b/drm/libmediadrm/Android.bp
@@ -167,6 +167,7 @@
],
header_libs: [
+ "libmediametrics_headers",
"libstagefright_foundation_headers",
],
}
diff --git a/drm/libmediadrm/tests/Android.bp b/drm/libmediadrm/tests/Android.bp
index 7471e05..6529387 100644
--- 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 @@
name: "EventMetric_test",
srcs: ["EventMetric_test.cpp"],
header_libs: [
- "libmedia_headers"
+ "libmedia_headers",
+ "libmediametrics_headers",
],
shared_libs: [
"liblog",
diff --git a/include/media/IMediaMetricsService.h b/include/media/IMediaMetricsService.h
deleted file mode 120000
index 84b99ee..0000000
--- a/include/media/IMediaMetricsService.h
+++ /dev/null
@@ -1 +0,0 @@
-../../media/libmediametrics/include/IMediaMetricsService.h
\ No newline at end of file
diff --git a/include/media/MediaMetrics.h b/include/media/MediaMetrics.h
deleted file mode 120000
index 5f757e4..0000000
--- a/include/media/MediaMetrics.h
+++ /dev/null
@@ -1 +0,0 @@
-../../media/libmediametrics/include/MediaMetrics.h
\ No newline at end of file
diff --git a/include/media/MediaMetricsItem.h b/include/media/MediaMetricsItem.h
deleted file mode 120000
index 5438953..0000000
--- a/include/media/MediaMetricsItem.h
+++ /dev/null
@@ -1 +0,0 @@
-../../media/libmediametrics/include/MediaMetricsItem.h
\ No newline at end of file
diff --git a/media/audioserver/Android.mk b/media/audioserver/Android.mk
index 79b77a0..f44f0d5 100644
--- a/media/audioserver/Android.mk
+++ b/media/audioserver/Android.mk
@@ -24,6 +24,7 @@
LOCAL_HEADER_LIBRARIES := \
libaudiohal_headers \
+ libmediametrics_headers \
# TODO oboeservice is the old folder name for aaudioservice. It will be changed.
LOCAL_C_INCLUDES := \
diff --git a/media/codec2/sfplugin/Android.bp b/media/codec2/sfplugin/Android.bp
index 534c1a7..94034b5 100644
--- a/media/codec2/sfplugin/Android.bp
+++ b/media/codec2/sfplugin/Android.bp
@@ -23,6 +23,7 @@
header_libs: [
"libcodec2_internal",
"libmediadrm_headers",
+ "libmediametrics_headers",
"media_ndk_headers",
],
diff --git a/media/codec2/sfplugin/tests/Android.bp b/media/codec2/sfplugin/tests/Android.bp
index b6eb2b4..c953f84 100644
--- a/media/codec2/sfplugin/tests/Android.bp
+++ b/media/codec2/sfplugin/tests/Android.bp
@@ -35,6 +35,7 @@
header_libs: [
"libmediadrm_headers",
+ "libmediametrics_headers",
],
shared_libs: [
diff --git a/media/libaaudio/src/Android.bp b/media/libaaudio/src/Android.bp
index baada22..ce853a6 100644
--- a/media/libaaudio/src/Android.bp
+++ b/media/libaaudio/src/Android.bp
@@ -76,6 +76,7 @@
header_libs: [
"libaaudio_headers",
"libmedia_headers",
+ "libmediametrics_headers",
],
export_header_lib_headers: ["libaaudio_headers"],
diff --git a/media/libaudioclient/tests/Android.bp b/media/libaudioclient/tests/Android.bp
index d509be6..350a780 100644
--- a/media/libaudioclient/tests/Android.bp
+++ b/media/libaudioclient/tests/Android.bp
@@ -13,6 +13,7 @@
"test_create_utils.cpp"],
header_libs: [
"libmedia_headers",
+ "libmediametrics_headers",
],
shared_libs: [
"libaudioclient",
@@ -30,6 +31,7 @@
"test_create_utils.cpp"],
header_libs: [
"libmedia_headers",
+ "libmediametrics_headers",
],
shared_libs: [
"libaudioclient",
diff --git a/media/libmediametrics/Android.bp b/media/libmediametrics/Android.bp
index 7fd5408..0cd5194 100644
--- 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",
diff --git a/media/libmediametrics/include/IMediaMetricsService.h b/media/libmediametrics/include/media/IMediaMetricsService.h
similarity index 100%
rename from media/libmediametrics/include/IMediaMetricsService.h
rename to media/libmediametrics/include/media/IMediaMetricsService.h
diff --git a/media/libmediametrics/include/MediaMetrics.h b/media/libmediametrics/include/media/MediaMetrics.h
similarity index 100%
rename from media/libmediametrics/include/MediaMetrics.h
rename to media/libmediametrics/include/media/MediaMetrics.h
diff --git a/media/libmediametrics/include/MediaMetricsItem.h b/media/libmediametrics/include/media/MediaMetricsItem.h
similarity index 100%
rename from media/libmediametrics/include/MediaMetricsItem.h
rename to media/libmediametrics/include/media/MediaMetricsItem.h
diff --git a/media/libmediaplayerservice/nuplayer/Android.bp b/media/libmediaplayerservice/nuplayer/Android.bp
index c8f48a2..32c97cf 100644
--- a/media/libmediaplayerservice/nuplayer/Android.bp
+++ b/media/libmediaplayerservice/nuplayer/Android.bp
@@ -19,6 +19,7 @@
header_libs: [
"libmediadrm_headers",
+ "libmediametrics_headers",
"media_plugin_headers",
],
diff --git a/media/ndk/Android.bp b/media/ndk/Android.bp
index 7b285a6..9bc6bd0 100644
--- a/media/ndk/Android.bp
+++ b/media/ndk/Android.bp
@@ -72,6 +72,7 @@
header_libs: [
"libmediadrm_headers",
+ "libmediametrics_headers",
],
shared_libs: [
diff --git a/services/camera/libcameraservice/Android.bp b/services/camera/libcameraservice/Android.bp
index c63feb2..940ed8a 100644
--- a/services/camera/libcameraservice/Android.bp
+++ b/services/camera/libcameraservice/Android.bp
@@ -75,7 +75,8 @@
],
header_libs: [
- "libmediadrm_headers"
+ "libmediadrm_headers",
+ "libmediametrics_headers",
],
shared_libs: [
diff --git a/services/mediaextractor/Android.bp b/services/mediaextractor/Android.bp
index 816a6b1..9d6d169 100644
--- a/services/mediaextractor/Android.bp
+++ b/services/mediaextractor/Android.bp
@@ -15,6 +15,9 @@
"libutils",
"liblog",
],
+ header_libs: [
+ "libmediametrics_headers",
+ ],
}
// service executable
diff --git a/services/mediametrics/Android.bp b/services/mediametrics/Android.bp
index 20f346c..ec59ec1 100644
--- a/services/mediametrics/Android.bp
+++ b/services/mediametrics/Android.bp
@@ -15,6 +15,9 @@
"libmediautils",
"libutils",
],
+ header_libs: [
+ "libmediametrics_headers",
+ ],
init_rc: [
"mediametrics.rc",