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

Commit cd603ca9 authored by Kevin Rocard's avatar Kevin Rocard Committed by Android (Google) Code Review
Browse files

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

parents 84a51275 49c56de5
Loading
Loading
Loading
Loading
+7 −0
Original line number Diff line number Diff line
@@ -7,15 +7,18 @@ 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
@@ -35,13 +38,17 @@ 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
+2 −5
Original line number Diff line number Diff line
@@ -16,10 +16,7 @@
cc_library_shared {
    name: "android.hardware.audio.common@2.0-util",
    defaults: ["hidl_defaults"],
    vendor_available: true,
    vndk: {
        enabled: true,
    },
    vendor: true,
    srcs: [
        "HidlUtils.cpp",
    ],
@@ -41,7 +38,7 @@ cc_library_shared {
    ],

    header_libs: [
        "libaudio_system_headers",
        "android.hardware.audio.common.legacy@2.0",
        "libhardware_headers",
    ],
}
+15 −0
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"],
}
+3 −0
Original line number Diff line number Diff line
elaurent@google.com
krocard@google.com
mnaganov@google.com
+709 −0

File added.

Preview size limit exceeded, changes collapsed.

Loading