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

Commit 8bdafc1b authored by Kevin Rocard's avatar Kevin Rocard
Browse files

Revert "Audio V4: Split system and vendor Audio.h" 

This reverts commit 49c56de5.

Reason for revert: Breaks the build of multiple devices

Change-Id: Iebd868467948b8afa5907462ccc0720cd9c4871e
parent 49c56de5

audio/README

+0 −7
Original line number Diff line number Diff line
@@ -7,18 +7,15 @@ audio 
|-- common           <== code common to audio core and effect API

|   |-- 2.0

|   |   |-- default  <== code that wraps the legacy API

|   |   |-- legacy   <== legacy API compatible with 2.0

|   |   `-- vts      <== vts of 2.0 core and effect API common code

|   |-- 4.0

|   |   |-- default

|   |   |-- legacy

|   |   `-- vts

|   |-- ...          <== The future versions should continue this structure

|   |   |-- default

|   |   `-- vts

|   `-- all_versions <== code common to all version of both core and effect API

|       |-- default

|   |   |-- legacy   <== legacy API compatible with all versions

|       `-- vts      <== vts of core and effect API common version independent code

|

|-- core           <== code relative to the core API
@@ -38,17 +35,13 @@ audio 
`-- effect           <== idem for the effect API

    |-- 2.0

    |   |-- default

    |   |-- legacy   <== legacy effect API compatible with 2.0

    |   `-- vts

    |-- 4.0

    |   |-- default

    |   |-- legacy

    |   `-- vts

    |-- ...

    |   |-- default

    |   |-- default

    |   `-- vts

    `-- all_versions

        |-- default

        |-- legacy

        `-- vts

audio/common/2.0/default/Android.bp

+5 −2
Original line number Diff line number Diff line
@@ -16,7 +16,10 @@ 
cc_library_shared {

    name: "android.hardware.audio.common@2.0-util",

    defaults: ["hidl_defaults"],

    vendor: true,

    vendor_available: true,

    vndk: {

        enabled: true,

    },

    srcs: [

        "HidlUtils.cpp",

    ],
@@ -38,7 +41,7 @@ cc_library_shared { 
    ],



    header_libs: [

        "android.hardware.audio.common.legacy@2.0",

        "libaudio_system_headers",

        "libhardware_headers",

    ],

}

audio/common/2.0/legacy/Android.bp

deleted100644 → 0
+0 −15
Original line number Diff line number Diff line 
cc_library_headers {

    name: "android.hardware.audio.common.legacy@2.0",

    vendor: true,

    header_libs: [

        "libhardware_headers",

        "android.hardware.audio.common.legacy@all-versions",

    ],

    export_header_lib_headers: [

        "libhardware_headers",

        "android.hardware.audio.common.legacy@all-versions",

    ],



    export_include_dirs: ["include"],

}

audio/common/2.0/legacy/OWNERS

deleted100644 → 0
+0 −3
Original line number Diff line number Diff line 
elaurent@google.com

krocard@google.com

mnaganov@google.com

audio/common/2.0/legacy/include/hardware/audio.h

deleted100644 → 0
+0 −709

File deleted.

Preview size limit exceeded, changes collapsed.