gugelfrei
/
android_frameworks_av
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
am: ef6bd3e3a5

Change-Id: Id54aa3ba3a1702aa4f8bcbecf01b94d3cefaf1d7
gugelfrei
Marco Nelissen 5 years ago committed by android-build-merger
parent 5eb34a7418 ef6bd3e3a5
commit 00900336c1
31 changed files with 60 additions and 21 deletions
Show Stats Download Patch File Download Diff File

4
camera/cameraserver/Android.bp
Unescape View File

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

10
drm/libmediadrm/Android.bp
Unescape View File

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

10
drm/libmediadrm/tests/Android.bp
Unescape View File

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

2
drm/libmediadrm/tests/CounterMetric_test.cpp
Unescape View File

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

2
drm/libmediadrm/tests/EventMetric_test.cpp
Unescape View File

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

1
include/media/BufferProviders.h
Unescape View File

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

1
include/media/CounterMetric.h
Unescape View File

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

1
include/media/EventMetric.h
Unescape View File

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

1
include/media/IDataSource.h
Unescape View File

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

1
include/media/IMediaLogService.h
Unescape View File

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

1
include/media/IMediaPlayerClient.h
Unescape View File

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

1
include/media/IMediaRecorderClient.h
Unescape View File

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

1
include/media/MemoryLeakTrackUtil.h
Unescape View File

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

1
include/media/Metadata.h
Unescape View File

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

1
include/media/MidiIoWrapper.h
Unescape View File

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

1
include/media/Modulo.h
Unescape View File

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

1
include/media/PluginMetricsReporting.h
Unescape View File

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

1
include/media/RingBuffer.h
Unescape View File

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

4
media/extractors/midi/Android.bp
Unescape View File

@ -6,6 +6,10 @@ cc_library_shared {
"frameworks/av/media/libstagefright/include",
],
header_libs: [
"libmedia_headers",
],
shared_libs: [
"liblog",
"libmediandk",

9
media/libaaudio/src/Android.bp
Unescape View File

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

1
media/libaudioclient/Android.bp
Unescape View File

@ -84,6 +84,7 @@ cc_library_shared {
header_libs: [
"libaudioclient_headers",
"libbase_headers",
"libmedia_headers",
],
export_header_lib_headers: ["libaudioclient_headers"],

6
media/libaudioclient/tests/Android.bp
Unescape View File

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

1
media/libaudioprocessing/Android.bp
Unescape View File

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

6
media/libaudioprocessing/tests/Android.bp
Unescape View File

@ -3,7 +3,11 @@
cc_defaults {
name: "libaudioprocessing_test_defaults",
header_libs: ["libbase_headers"],
header_libs: [
"libbase_headers",
"libmedia_headers",
],
shared_libs: [
"libaudioclient",
"libaudioprocessing",

1
media/libmedia/Android.bp
Unescape View File

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

1
media/libstagefright/id3/Android.bp
Unescape View File

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

1
media/libstagefright/webm/Android.bp
Unescape View File

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

4
media/ndk/Android.bp
Unescape View File

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

1
media/utils/Android.bp
Unescape View File

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

1
services/mediadrm/Android.mk
Unescape View File

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

4
services/medialog/Android.bp
Unescape View File

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

Write Preview
Loading…
Cancel
Save