Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2c4332d6 authored by Kevin Rocard's avatar Kevin Rocard Committed by android-build-merger
Browse files

Change some formatting for better script parsing am: 55a45182 

am: 0633232f

Change-Id: I4af23b41d19f0a003e8249d19cdc7f494d23861c
parents cfe4df42 0633232f

audio/common/all-versions/default/Android.bp

+0 −3
Original line number Diff line number Diff line
@@ -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",

    ],

audio/common/all-versions/default/service/service.cpp

+12 −8
Original line number Diff line number Diff line
@@ -59,16 +59,20 @@ int main(int /* argc */, char* /* argv */ []) { 
    }

    configureRpcThreadpool(16, true /*callerWillJoin*/);



    LOG_ALWAYS_FATAL_IF((registerPassthroughServiceImplementations<audio::V5_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,

    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,

audio/core/all-versions/default/Android.bp

+0 −5
Original line number Diff line number Diff line
@@ -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",

audio/effect/all-versions/default/Android.bp

+0 −3
Original line number Diff line number Diff line
@@ -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",