Merge "Remove more header symlinks" am: a2bc7eada8 am: ec565c575d

am: ef6bd3e3a5

Change-Id: Id54aa3ba3a1702aa4f8bcbecf01b94d3cefaf1d7

camera/cameraserver/Android.bp

@@ -17,6 +17,10 @@ cc_binary {
 
     srcs: ["main_cameraserver.cpp"],
 
+    header_libs: [
+        "libmedia_headers",
+    ],
+
     shared_libs: [
         "libcameraservice",
         "liblog",

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",

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",

drm/libmediadrm/tests/CounterMetric_test.cpp

@@ -16,7 +16,7 @@
 
 #include <gtest/gtest.h>
 
-#include "CounterMetric.h"
+#include <media/CounterMetric.h>
 
 namespace android {
 

drm/libmediadrm/tests/EventMetric_test.cpp

@@ -16,7 +16,7 @@
 
 #include <gtest/gtest.h>
 
-#include "EventMetric.h"
+#include <media/EventMetric.h>
 
 namespace android {
 

include/media/BufferProviders.h

@@ -1 +0,0 @@
-../../media/libmedia/include/media/BufferProviders.h

include/media/CounterMetric.h

@@ -1 +0,0 @@
-../../media/libmedia/include/media/CounterMetric.h

include/media/EventMetric.h

@@ -1 +0,0 @@
-../../media/libmedia/include/media/EventMetric.h

include/media/IDataSource.h

@@ -1 +0,0 @@
-../../media/libmedia/include/media/IDataSource.h

include/media/IMediaLogService.h

@@ -1 +0,0 @@
-../../media/libmedia/include/media/IMediaLogService.h

include/media/IMediaPlayerClient.h

@@ -1 +0,0 @@
-../../media/libmedia/include/media/IMediaPlayerClient.h

include/media/IMediaRecorderClient.h

@@ -1 +0,0 @@
-../../media/libmedia/include/media/IMediaRecorderClient.h

include/media/MemoryLeakTrackUtil.h

@@ -1 +0,0 @@
-../../media/libmedia/include/media/MemoryLeakTrackUtil.h

include/media/Metadata.h

@@ -1 +0,0 @@
-../../media/libmedia/include/media/Metadata.h

include/media/MidiIoWrapper.h

@@ -1 +0,0 @@
-../../media/libmedia/include/media/MidiIoWrapper.h

include/media/Modulo.h

@@ -1 +0,0 @@
-../../media/libmedia/include/media/Modulo.h

include/media/PluginMetricsReporting.h

@@ -1 +0,0 @@
-../../media/libmedia/include/media/PluginMetricsReporting.h

include/media/RingBuffer.h

@@ -1 +0,0 @@
-../../media/libmedia/include/media/RingBuffer.h

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",

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: [

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"],
 

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",

media/libaudioprocessing/Android.bp

@@ -33,6 +33,7 @@ cc_library_shared {
 
     header_libs: [
         "libbase_headers",
+        "libmedia_headers"
     ],
 
     shared_libs: [

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",

media/libmedia/Android.bp

@@ -197,6 +197,7 @@ cc_library_static {
     ],
 
     header_libs: [
+        "libmedia_headers",
         "media_ndk_headers",
     ],
 

media/libstagefright/id3/Android.bp

@@ -4,6 +4,7 @@ cc_library_static {
     srcs: ["ID3.cpp"],
 
     header_libs: [
+        "libmedia_headers",
         "media_ndk_headers",
     ],
 

media/libstagefright/webm/Android.bp

@@ -34,6 +34,7 @@ cc_library_static {
     ],
 
     header_libs: [
+        "libmedia_headers",
         "media_ndk_headers",
     ],
 }

media/ndk/Android.bp

@@ -149,6 +149,10 @@ cc_library {
         "-Wall",
     ],
 
+    header_libs: [
+        "libmedia_headers",
+    ],
+
     shared_libs: [
     ],
 

media/utils/Android.bp

@@ -48,6 +48,7 @@ cc_library {
 
     header_libs: [
         "bionic_libc_platform_headers",
+        "libmedia_headers",
     ],
 
     local_include_dirs: ["include"],

services/mediadrm/Android.mk

@@ -21,6 +21,7 @@ LOCAL_SRC_FILES:= \
     main_mediadrmserver.cpp
 
 LOCAL_HEADER_LIBRARIES:= \
+    libmedia_headers \
     libmediadrm_headers
 
 LOCAL_SHARED_LIBRARIES:= \

services/medialog/Android.bp

@@ -6,6 +6,10 @@ cc_library_shared {
         "MediaLogService.cpp",
     ],
 
+    header_libs: [
+        "libmedia_headers",
+    ],
+
     shared_libs: [
         "libaudioutils",
         "libbinder",