Remove mediametrics include symlinks
Bug: 143245419
Test: build
Change-Id: I6c836e60c0fe078f5ab7370aec156bdd6e8dcbf0
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: [