From 6b2859450f91f1cdd8b3ca2435df4dd37907cd8a Mon Sep 17 00:00:00 2001 From: Marco Nelissen Date: Mon, 21 Oct 2019 14:52:30 -0700 Subject: [PATCH] Remove more header symlinks Test: build Bug: 143245419 Change-Id: I9bb03d54c7792625b73602f2d3721e29f8f929be --- camera/cameraserver/Android.bp | 4 ++++ drm/libmediadrm/Android.bp | 10 ++++++++++ drm/libmediadrm/tests/Android.bp | 10 +++++++--- drm/libmediadrm/tests/CounterMetric_test.cpp | 2 +- drm/libmediadrm/tests/EventMetric_test.cpp | 2 +- include/media/BufferProviders.h | 1 - include/media/CounterMetric.h | 1 - include/media/EventMetric.h | 1 - include/media/IDataSource.h | 1 - include/media/IMediaLogService.h | 1 - include/media/IMediaPlayerClient.h | 1 - include/media/IMediaRecorderClient.h | 1 - include/media/MemoryLeakTrackUtil.h | 1 - include/media/Metadata.h | 1 - include/media/MidiIoWrapper.h | 1 - include/media/Modulo.h | 1 - include/media/PluginMetricsReporting.h | 1 - include/media/RingBuffer.h | 1 - media/extractors/midi/Android.bp | 4 ++++ media/libaaudio/src/Android.bp | 9 +++++++-- media/libaudioclient/Android.bp | 1 + media/libaudioclient/tests/Android.bp | 6 ++++++ media/libaudioprocessing/Android.bp | 1 + media/libaudioprocessing/tests/Android.bp | 6 +++++- media/libmedia/Android.bp | 1 + media/libstagefright/id3/Android.bp | 1 + media/libstagefright/webm/Android.bp | 1 + media/ndk/Android.bp | 4 ++++ media/utils/Android.bp | 1 + services/mediadrm/Android.mk | 1 + services/medialog/Android.bp | 4 ++++ 31 files changed, 60 insertions(+), 21 deletions(-) delete mode 120000 include/media/BufferProviders.h delete mode 120000 include/media/CounterMetric.h delete mode 120000 include/media/EventMetric.h delete mode 120000 include/media/IDataSource.h delete mode 120000 include/media/IMediaLogService.h delete mode 120000 include/media/IMediaPlayerClient.h delete mode 120000 include/media/IMediaRecorderClient.h delete mode 120000 include/media/MemoryLeakTrackUtil.h delete mode 120000 include/media/Metadata.h delete mode 120000 include/media/MidiIoWrapper.h delete mode 120000 include/media/Modulo.h delete mode 120000 include/media/PluginMetricsReporting.h delete mode 120000 include/media/RingBuffer.h diff --git a/camera/cameraserver/Android.bp b/camera/cameraserver/Android.bp index 334f879818..320c499c2c 100644 --- a/camera/cameraserver/Android.bp +++ b/camera/cameraserver/Android.bp @@ -17,6 +17,10 @@ cc_binary { srcs: ["main_cameraserver.cpp"], + header_libs: [ + "libmedia_headers", + ], + shared_libs: [ "libcameraservice", "liblog", diff --git a/drm/libmediadrm/Android.bp b/drm/libmediadrm/Android.bp index 39b048a964..84f2f6da63 100644 --- a/drm/libmediadrm/Android.bp +++ b/drm/libmediadrm/Android.bp @@ -35,6 +35,10 @@ cc_library_shared { "include" ], + header_libs: [ + "libmedia_headers", + ], + shared_libs: [ "libbinder", "libcutils", @@ -75,6 +79,9 @@ cc_library_shared { export_proto_headers: true, type: "lite", }, + header_libs: [ + "libmedia_headers", + ], shared_libs: [ "android.hardware.drm@1.0", "android.hardware.drm@1.1", @@ -110,6 +117,9 @@ cc_library_shared { export_proto_headers: true, type: "full", }, + header_libs: [ + "libmedia_headers", + ], shared_libs: [ "android.hardware.drm@1.0", "android.hardware.drm@1.1", diff --git a/drm/libmediadrm/tests/Android.bp b/drm/libmediadrm/tests/Android.bp index 873083b162..2e39943603 100644 --- a/drm/libmediadrm/tests/Android.bp +++ b/drm/libmediadrm/tests/Android.bp @@ -3,8 +3,8 @@ cc_test { name: "CounterMetric_test", srcs: ["CounterMetric_test.cpp"], + header_libs: ["libmedia_headers"], shared_libs: ["libmediadrm"], - include_dirs: ["frameworks/av/include/media"], cflags: [ "-Werror", "-Wall", @@ -14,6 +14,9 @@ cc_test { cc_test { name: "DrmMetrics_test", srcs: ["DrmMetrics_test.cpp"], + header_libs: [ + "libmedia_headers" + ], shared_libs: [ "android.hardware.drm@1.0", "android.hardware.drm@1.1", @@ -29,7 +32,6 @@ cc_test { static_libs: ["libgmock"], include_dirs: [ "frameworks/av/drm/libmediadrm/include", - "frameworks/av/include/media", ], cflags: [ // Suppress unused parameter and no error options. These cause problems @@ -41,12 +43,14 @@ cc_test { cc_test { name: "EventMetric_test", srcs: ["EventMetric_test.cpp"], + header_libs: [ + "libmedia_headers" + ], shared_libs: [ "liblog", "libmediadrm", "libutils", ], - include_dirs: ["frameworks/av/include/media"], cflags: [ "-Werror", "-Wall", diff --git a/drm/libmediadrm/tests/CounterMetric_test.cpp b/drm/libmediadrm/tests/CounterMetric_test.cpp index 6bca0dafe2..c2becb42ae 100644 --- a/drm/libmediadrm/tests/CounterMetric_test.cpp +++ b/drm/libmediadrm/tests/CounterMetric_test.cpp @@ -16,7 +16,7 @@ #include -#include "CounterMetric.h" +#include namespace android { diff --git a/drm/libmediadrm/tests/EventMetric_test.cpp b/drm/libmediadrm/tests/EventMetric_test.cpp index eb6c4f684b..b3c3f62b72 100644 --- a/drm/libmediadrm/tests/EventMetric_test.cpp +++ b/drm/libmediadrm/tests/EventMetric_test.cpp @@ -16,7 +16,7 @@ #include -#include "EventMetric.h" +#include namespace android { diff --git a/include/media/BufferProviders.h b/include/media/BufferProviders.h deleted file mode 120000 index 779bb150a7..0000000000 --- a/include/media/BufferProviders.h +++ /dev/null @@ -1 +0,0 @@ -../../media/libmedia/include/media/BufferProviders.h \ No newline at end of file diff --git a/include/media/CounterMetric.h b/include/media/CounterMetric.h deleted file mode 120000 index baba043a66..0000000000 --- a/include/media/CounterMetric.h +++ /dev/null @@ -1 +0,0 @@ -../../media/libmedia/include/media/CounterMetric.h \ No newline at end of file diff --git a/include/media/EventMetric.h b/include/media/EventMetric.h deleted file mode 120000 index 5707d9a275..0000000000 --- a/include/media/EventMetric.h +++ /dev/null @@ -1 +0,0 @@ -../../media/libmedia/include/media/EventMetric.h \ No newline at end of file diff --git a/include/media/IDataSource.h b/include/media/IDataSource.h deleted file mode 120000 index 41cdd8b874..0000000000 --- a/include/media/IDataSource.h +++ /dev/null @@ -1 +0,0 @@ -../../media/libmedia/include/media/IDataSource.h \ No newline at end of file diff --git a/include/media/IMediaLogService.h b/include/media/IMediaLogService.h deleted file mode 120000 index 245a29d18b..0000000000 --- a/include/media/IMediaLogService.h +++ /dev/null @@ -1 +0,0 @@ -../../media/libmedia/include/media/IMediaLogService.h \ No newline at end of file diff --git a/include/media/IMediaPlayerClient.h b/include/media/IMediaPlayerClient.h deleted file mode 120000 index b6547cef55..0000000000 --- a/include/media/IMediaPlayerClient.h +++ /dev/null @@ -1 +0,0 @@ -../../media/libmedia/include/media/IMediaPlayerClient.h \ No newline at end of file diff --git a/include/media/IMediaRecorderClient.h b/include/media/IMediaRecorderClient.h deleted file mode 120000 index 89f43597bf..0000000000 --- a/include/media/IMediaRecorderClient.h +++ /dev/null @@ -1 +0,0 @@ -../../media/libmedia/include/media/IMediaRecorderClient.h \ No newline at end of file diff --git a/include/media/MemoryLeakTrackUtil.h b/include/media/MemoryLeakTrackUtil.h deleted file mode 120000 index 504173e583..0000000000 --- a/include/media/MemoryLeakTrackUtil.h +++ /dev/null @@ -1 +0,0 @@ -../../media/libmedia/include/media/MemoryLeakTrackUtil.h \ No newline at end of file diff --git a/include/media/Metadata.h b/include/media/Metadata.h deleted file mode 120000 index e42116823b..0000000000 --- a/include/media/Metadata.h +++ /dev/null @@ -1 +0,0 @@ -../../media/libmedia/include/media/Metadata.h \ No newline at end of file diff --git a/include/media/MidiIoWrapper.h b/include/media/MidiIoWrapper.h deleted file mode 120000 index 786ec3ded5..0000000000 --- a/include/media/MidiIoWrapper.h +++ /dev/null @@ -1 +0,0 @@ -../../media/libmedia/include/media/MidiIoWrapper.h \ No newline at end of file diff --git a/include/media/Modulo.h b/include/media/Modulo.h deleted file mode 120000 index 989c4cb9df..0000000000 --- a/include/media/Modulo.h +++ /dev/null @@ -1 +0,0 @@ -../../media/libmedia/include/media/Modulo.h \ No newline at end of file diff --git a/include/media/PluginMetricsReporting.h b/include/media/PluginMetricsReporting.h deleted file mode 120000 index 7d9a7a089f..0000000000 --- a/include/media/PluginMetricsReporting.h +++ /dev/null @@ -1 +0,0 @@ -../../media/libmedia/include/media/PluginMetricsReporting.h \ No newline at end of file diff --git a/include/media/RingBuffer.h b/include/media/RingBuffer.h deleted file mode 120000 index 9af28d5510..0000000000 --- a/include/media/RingBuffer.h +++ /dev/null @@ -1 +0,0 @@ -../../media/libmedia/include/media/RingBuffer.h \ No newline at end of file diff --git a/media/extractors/midi/Android.bp b/media/extractors/midi/Android.bp index 7d42e703f3..d36cb49ba1 100644 --- a/media/extractors/midi/Android.bp +++ b/media/extractors/midi/Android.bp @@ -6,6 +6,10 @@ cc_library_shared { "frameworks/av/media/libstagefright/include", ], + header_libs: [ + "libmedia_headers", + ], + shared_libs: [ "liblog", "libmediandk", diff --git a/media/libaaudio/src/Android.bp b/media/libaaudio/src/Android.bp index 56c0170fea..850b1d00e0 100644 --- a/media/libaaudio/src/Android.bp +++ b/media/libaaudio/src/Android.bp @@ -10,7 +10,9 @@ cc_library { "legacy", "utility", ], - header_libs: ["libaaudio_headers"], + header_libs: [ + "libaaudio_headers", + ], export_header_lib_headers: ["libaaudio_headers"], version_script: "libaaudio.map.txt", @@ -53,7 +55,10 @@ cc_library { ], export_include_dirs: ["."], - header_libs: ["libaaudio_headers"], + header_libs: [ + "libaaudio_headers", + "libmedia_headers" + ], export_header_lib_headers: ["libaaudio_headers"], shared_libs: [ diff --git a/media/libaudioclient/Android.bp b/media/libaudioclient/Android.bp index c516d20f2b..32904bb201 100644 --- a/media/libaudioclient/Android.bp +++ b/media/libaudioclient/Android.bp @@ -84,6 +84,7 @@ cc_library_shared { header_libs: [ "libaudioclient_headers", "libbase_headers", + "libmedia_headers", ], export_header_lib_headers: ["libaudioclient_headers"], diff --git a/media/libaudioclient/tests/Android.bp b/media/libaudioclient/tests/Android.bp index 52bb2fb9b9..d509be67d8 100644 --- a/media/libaudioclient/tests/Android.bp +++ b/media/libaudioclient/tests/Android.bp @@ -11,6 +11,9 @@ cc_test { defaults: ["libaudioclient_tests_defaults"], srcs: ["test_create_audiotrack.cpp", "test_create_utils.cpp"], + header_libs: [ + "libmedia_headers", + ], shared_libs: [ "libaudioclient", "libbinder", @@ -25,6 +28,9 @@ cc_test { defaults: ["libaudioclient_tests_defaults"], srcs: ["test_create_audiorecord.cpp", "test_create_utils.cpp"], + header_libs: [ + "libmedia_headers", + ], shared_libs: [ "libaudioclient", "libbinder", diff --git a/media/libaudioprocessing/Android.bp b/media/libaudioprocessing/Android.bp index e8aa700aef..9b5d58cef0 100644 --- a/media/libaudioprocessing/Android.bp +++ b/media/libaudioprocessing/Android.bp @@ -33,6 +33,7 @@ cc_library_shared { header_libs: [ "libbase_headers", + "libmedia_headers" ], shared_libs: [ diff --git a/media/libaudioprocessing/tests/Android.bp b/media/libaudioprocessing/tests/Android.bp index f4e497b9e7..20c2c2ce18 100644 --- a/media/libaudioprocessing/tests/Android.bp +++ b/media/libaudioprocessing/tests/Android.bp @@ -3,7 +3,11 @@ cc_defaults { name: "libaudioprocessing_test_defaults", - header_libs: ["libbase_headers"], + header_libs: [ + "libbase_headers", + "libmedia_headers", + ], + shared_libs: [ "libaudioclient", "libaudioprocessing", diff --git a/media/libmedia/Android.bp b/media/libmedia/Android.bp index fdab14a732..a6b6412bd8 100644 --- a/media/libmedia/Android.bp +++ b/media/libmedia/Android.bp @@ -197,6 +197,7 @@ cc_library_static { ], header_libs: [ + "libmedia_headers", "media_ndk_headers", ], diff --git a/media/libstagefright/id3/Android.bp b/media/libstagefright/id3/Android.bp index d9704a6026..c8173cf851 100644 --- a/media/libstagefright/id3/Android.bp +++ b/media/libstagefright/id3/Android.bp @@ -4,6 +4,7 @@ cc_library_static { srcs: ["ID3.cpp"], header_libs: [ + "libmedia_headers", "media_ndk_headers", ], diff --git a/media/libstagefright/webm/Android.bp b/media/libstagefright/webm/Android.bp index 9f3e807472..2cebe8fcda 100644 --- a/media/libstagefright/webm/Android.bp +++ b/media/libstagefright/webm/Android.bp @@ -34,6 +34,7 @@ cc_library_static { ], header_libs: [ + "libmedia_headers", "media_ndk_headers", ], } diff --git a/media/ndk/Android.bp b/media/ndk/Android.bp index 61f90146ad..aac6d71efe 100644 --- a/media/ndk/Android.bp +++ b/media/ndk/Android.bp @@ -149,6 +149,10 @@ cc_library { "-Wall", ], + header_libs: [ + "libmedia_headers", + ], + shared_libs: [ ], diff --git a/media/utils/Android.bp b/media/utils/Android.bp index 2dbc476fba..63437da4bd 100644 --- a/media/utils/Android.bp +++ b/media/utils/Android.bp @@ -47,6 +47,7 @@ cc_library { header_libs: [ "bionic_libc_platform_headers", + "libmedia_headers", ], local_include_dirs: ["include"], diff --git a/services/mediadrm/Android.mk b/services/mediadrm/Android.mk index d4bb48a5c1..9f03964ee4 100644 --- a/services/mediadrm/Android.mk +++ b/services/mediadrm/Android.mk @@ -21,6 +21,7 @@ LOCAL_SRC_FILES:= \ main_mediadrmserver.cpp LOCAL_HEADER_LIBRARIES:= \ + libmedia_headers \ libmediadrm_headers LOCAL_SHARED_LIBRARIES:= \ diff --git a/services/medialog/Android.bp b/services/medialog/Android.bp index bee5d25a2d..74b63d5153 100644 --- a/services/medialog/Android.bp +++ b/services/medialog/Android.bp @@ -6,6 +6,10 @@ cc_library_shared { "MediaLogService.cpp", ], + header_libs: [ + "libmedia_headers", + ], + shared_libs: [ "libaudioutils", "libbinder",