Evolution-x/hardware_interfaces
1
0
Fork 0
mirror of https://github.com/Evolution-X/hardware_interfaces synced 2026-02-02 10:05:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Change some formatting for better script parsing

Browse Source 
Test: Compile
Bug: 134940862
Change-Id: Ibbafdcaa6e0bfa8fd2b80f4a6c9ac6ac95058f93
Merged-In: Ibbafdcaa6e0bfa8fd2b80f4a6c9ac6ac95058f93
Signed-off-by: Kevin Rocard <krocard@google.com>
This commit is contained in:
Kevin Rocard
2019-06-18 15:39:17 -07:00
committed by Mikhail Naganov
parent 82d3a0b3c7
commit 55a451825c
4 changed files with 12 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
audio/common/all-versions/default/Android.bp
View File

@@ -69,7 +69,6 @@ cc_defaults {
cc_library_shared {
name: "android.hardware.audio.common@2.0-util",
defaults: ["android.hardware.audio.common-util_default"],
shared_libs: [
"android.hardware.audio.common@2.0",
],
@@ -83,7 +82,6 @@ cc_library_shared {
cc_library_shared {
name: "android.hardware.audio.common@4.0-util",
defaults: ["android.hardware.audio.common-util_default"],
shared_libs: [
"android.hardware.audio.common@4.0",
],
@@ -97,7 +95,6 @@ cc_library_shared {
cc_library_shared {
name: "android.hardware.audio.common@5.0-util",
defaults: ["android.hardware.audio.common-util_default"],
shared_libs: [
"android.hardware.audio.common@5.0",
],

20
audio/common/all-versions/default/service/service.cpp
View File

@@ -59,16 +59,20 @@ int main(int /* argc */, char* /* argv */ []) {
}
configureRpcThreadpool(16, true /*callerWillJoin*/);
LOG_ALWAYS_FATAL_IF((registerPassthroughServiceImplementations<audio::V5_0::IDevicesFactory,
audio::V4_0::IDevicesFactory,
audio::V2_0::IDevicesFactory>()),
// Keep versions on a separate line for easier parsing
// clang-format off
LOG_ALWAYS_FATAL_IF((registerPassthroughServiceImplementations<
audio::V5_0::IDevicesFactory,
audio::V4_0::IDevicesFactory,
audio::V2_0::IDevicesFactory>()),
"Could not register audio core API");
LOG_ALWAYS_FATAL_IF(
(registerPassthroughServiceImplementations<audio::effect::V5_0::IEffectsFactory,
audio::effect::V4_0::IEffectsFactory,
audio::effect::V2_0::IEffectsFactory>()),
"Could not register audio effect API");
LOG_ALWAYS_FATAL_IF((registerPassthroughServiceImplementations<
audio::effect::V5_0::IEffectsFactory,
audio::effect::V4_0::IEffectsFactory,
audio::effect::V2_0::IEffectsFactory>()),
"Could not register audio effect API");
// clang-format on
ALOGW_IF((registerPassthroughServiceImplementations<soundtrigger::V2_2::ISoundTriggerHw,
soundtrigger::V2_1::ISoundTriggerHw,

5
audio/core/all-versions/default/Android.bp
View File

@@ -45,13 +45,11 @@ cc_defaults {
cc_library_shared {
name: "android.hardware.audio@2.0-impl",
defaults: ["android.hardware.audio-impl_default"],
shared_libs: [
"android.hardware.audio@2.0",
"android.hardware.audio.common@2.0",
"android.hardware.audio.common@2.0-util",
],
cflags: [
"-DMAJOR_VERSION=2",
"-DMINOR_VERSION=0",
@@ -68,7 +66,6 @@ cc_library_shared {
"android.hardware.audio.common@4.0",
"android.hardware.audio.common@4.0-util",
],
cflags: [
"-DMAJOR_VERSION=4",
"-DMINOR_VERSION=0",
@@ -79,13 +76,11 @@ cc_library_shared {
cc_library_shared {
name: "android.hardware.audio@5.0-impl",
defaults: ["android.hardware.audio-impl_default"],
shared_libs: [
"android.hardware.audio@5.0",
"android.hardware.audio.common@5.0",
"android.hardware.audio.common@5.0-util",
],
cflags: [
"-DMAJOR_VERSION=5",
"-DMINOR_VERSION=0",

3
audio/effect/all-versions/default/Android.bp
View File

@@ -52,7 +52,6 @@ cc_library_shared {
"android.hardware.audio.common@2.0-util",
"android.hardware.audio.effect@2.0",
],
cflags: [
"-DMAJOR_VERSION=2",
"-DMINOR_VERSION=0",
@@ -68,7 +67,6 @@ cc_library_shared {
"android.hardware.audio.common@4.0-util",
"android.hardware.audio.effect@4.0",
],
cflags: [
"-DMAJOR_VERSION=4",
"-DMINOR_VERSION=0",
@@ -84,7 +82,6 @@ cc_library_shared {
"android.hardware.audio.common@5.0-util",
"android.hardware.audio.effect@5.0",
],
cflags: [
"-DMAJOR_VERSION=5",
"-DMINOR_VERSION=0",