diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-07-22 17:31:46 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-22 17:31:46 +0000 |
| commit | b4a1b4f93a94a108068ec3cbc9bb3739ffea9bbf (patch) | |
| tree | 46e28f2c6242f74e078e2fc84f73a81214cc3419 /audio | |
| parent | cc4656f5a83f8369f8e5b727f1ccf04f837b356e (diff) | |
| parent | 3ef99476244bf27af5907a1d84fb89e9ffefb831 (diff) | |
| download | platform_hardware_interfaces-b4a1b4f93a94a108068ec3cbc9bb3739ffea9bbf.tar.gz platform_hardware_interfaces-b4a1b4f93a94a108068ec3cbc9bb3739ffea9bbf.tar.bz2 platform_hardware_interfaces-b4a1b4f93a94a108068ec3cbc9bb3739ffea9bbf.zip | |
Merge "Provide defaults for android.hardware.audio@6.0-impl" am: 3f5116a1f6 am: 5912212c62 am: 3ef9947624
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1366502
Change-Id: I6bfc3c3cc6209c93721d490d644f5babf10682cc
Diffstat (limited to 'audio')
| -rw-r--r-- | audio/core/all-versions/default/Android.bp | 38 |
1 files changed, 29 insertions, 9 deletions
diff --git a/audio/core/all-versions/default/Android.bp b/audio/core/all-versions/default/Android.bp index 0af81b2bd4..8fdb70d1a2 100644 --- a/audio/core/all-versions/default/Android.bp +++ b/audio/core/all-versions/default/Android.bp @@ -1,8 +1,5 @@ -cc_defaults { - name: "android.hardware.audio-impl_default", - relative_install_path: "hw", - proprietary: true, - vendor: true, +filegroup { + name: "android.hardware.audio-impl_srcs", srcs: [ "Conversions.cpp", "Device.cpp", @@ -13,10 +10,23 @@ cc_defaults { "StreamIn.cpp", "StreamOut.cpp", ], +} - defaults: ["hidl_defaults"], - +cc_library_headers { + name: "android.hardware.audio-impl_headers", + proprietary: true, + vendor: true, export_include_dirs: ["include"], +} + +cc_defaults { + name: "android.hardware.audio-impl_default", + relative_install_path: "hw", + proprietary: true, + vendor: true, + srcs: [":android.hardware.audio-impl_srcs"], + + defaults: ["hidl_defaults"], static_libs: [ "libaudiofoundation", @@ -35,12 +45,17 @@ cc_defaults { ], header_libs: [ + "android.hardware.audio-impl_headers", "android.hardware.audio.common.util@all-versions", "libaudioclient_headers", "libaudio_system_headers", "libhardware_headers", "libmedia_headers", ], + + export_header_lib_headers: [ + "android.hardware.audio-impl_headers", + ], } cc_library_shared { @@ -89,8 +104,8 @@ cc_library_shared { ], } -cc_library_shared { - name: "android.hardware.audio@6.0-impl", +cc_defaults { + name: "android.hardware.audio@6.0-impl_default", defaults: ["android.hardware.audio-impl_default"], shared_libs: [ "android.hardware.audio@6.0", @@ -103,3 +118,8 @@ cc_library_shared { "-include common/all-versions/VersionMacro.h", ], } + +cc_library_shared { + name: "android.hardware.audio@6.0-impl", + defaults: ["android.hardware.audio@6.0-impl_default"], +} |