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

Commit afd7e474 authored by Steven Moreland's avatar Steven Moreland Committed by android-build-merger
Browse files

Merge changes from topic "hidl-soong-plugin" 

am: 0f2eb8b2

Change-Id: I4315fecb7466a4432e4f90f66c1ac6ef6e9d43e4
parents 5883f336 0f2eb8b2

Android.bp

+5 −0
Original line number Original line Diff line number Diff line
@@ -2,6 +2,11 @@ subdirs = [ 
    "*"

    "*"

]

]





hidl_package_root {

    name: "android.hardware",

    path: "hardware/interfaces",

}



cc_defaults {

cc_defaults {

    name: "hidl_defaults",

    name: "hidl_defaults",

    cflags: [

    cflags: [

audio/2.0/Android.bp

+20 −204
Original line number Original line Diff line number Diff line 
// This file is autogenerated by hidl-gen. Do not edit manually.

// This file is autogenerated by hidl-gen -Landroidbp.





filegroup {

hidl_interface {

    name: "android.hardware.audio@2.0_hal",

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

    root: "android.hardware",

    vndk: {

        enabled: true,

    },

    srcs: [

    srcs: [

        "types.hal",

        "types.hal",

        "IDevice.hal",

        "IDevice.hal",
@@ -12,209 +16,21 @@ filegroup { 
        "IStreamOut.hal",

        "IStreamOut.hal",

        "IStreamOutCallback.hal",

        "IStreamOutCallback.hal",

    ],

    ],

}

    interfaces: [



genrule {

    name: "android.hardware.audio@2.0_genc++",

    tools: ["hidl-gen"],

    cmd: "$(location hidl-gen) -o $(genDir) -Lc++-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.audio@2.0",

    srcs: [

        ":android.hardware.audio@2.0_hal",

    ],

    out: [

        "android/hardware/audio/2.0/types.cpp",

        "android/hardware/audio/2.0/DeviceAll.cpp",

        "android/hardware/audio/2.0/DevicesFactoryAll.cpp",

        "android/hardware/audio/2.0/PrimaryDeviceAll.cpp",

        "android/hardware/audio/2.0/StreamAll.cpp",

        "android/hardware/audio/2.0/StreamInAll.cpp",

        "android/hardware/audio/2.0/StreamOutAll.cpp",

        "android/hardware/audio/2.0/StreamOutCallbackAll.cpp",

    ],

}



genrule {

    name: "android.hardware.audio@2.0_genc++_headers",

    tools: ["hidl-gen"],

    cmd: "$(location hidl-gen) -o $(genDir) -Lc++-headers -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.audio@2.0",

    srcs: [

        ":android.hardware.audio@2.0_hal",

    ],

    out: [

        "android/hardware/audio/2.0/types.h",

        "android/hardware/audio/2.0/hwtypes.h",

        "android/hardware/audio/2.0/IDevice.h",

        "android/hardware/audio/2.0/IHwDevice.h",

        "android/hardware/audio/2.0/BnHwDevice.h",

        "android/hardware/audio/2.0/BpHwDevice.h",

        "android/hardware/audio/2.0/BsDevice.h",

        "android/hardware/audio/2.0/IDevicesFactory.h",

        "android/hardware/audio/2.0/IHwDevicesFactory.h",

        "android/hardware/audio/2.0/BnHwDevicesFactory.h",

        "android/hardware/audio/2.0/BpHwDevicesFactory.h",

        "android/hardware/audio/2.0/BsDevicesFactory.h",

        "android/hardware/audio/2.0/IPrimaryDevice.h",

        "android/hardware/audio/2.0/IHwPrimaryDevice.h",

        "android/hardware/audio/2.0/BnHwPrimaryDevice.h",

        "android/hardware/audio/2.0/BpHwPrimaryDevice.h",

        "android/hardware/audio/2.0/BsPrimaryDevice.h",

        "android/hardware/audio/2.0/IStream.h",

        "android/hardware/audio/2.0/IHwStream.h",

        "android/hardware/audio/2.0/BnHwStream.h",

        "android/hardware/audio/2.0/BpHwStream.h",

        "android/hardware/audio/2.0/BsStream.h",

        "android/hardware/audio/2.0/IStreamIn.h",

        "android/hardware/audio/2.0/IHwStreamIn.h",

        "android/hardware/audio/2.0/BnHwStreamIn.h",

        "android/hardware/audio/2.0/BpHwStreamIn.h",

        "android/hardware/audio/2.0/BsStreamIn.h",

        "android/hardware/audio/2.0/IStreamOut.h",

        "android/hardware/audio/2.0/IHwStreamOut.h",

        "android/hardware/audio/2.0/BnHwStreamOut.h",

        "android/hardware/audio/2.0/BpHwStreamOut.h",

        "android/hardware/audio/2.0/BsStreamOut.h",

        "android/hardware/audio/2.0/IStreamOutCallback.h",

        "android/hardware/audio/2.0/IHwStreamOutCallback.h",

        "android/hardware/audio/2.0/BnHwStreamOutCallback.h",

        "android/hardware/audio/2.0/BpHwStreamOutCallback.h",

        "android/hardware/audio/2.0/BsStreamOutCallback.h",

    ],

}



cc_library {

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

    defaults: ["hidl-module-defaults"],

    generated_sources: ["android.hardware.audio@2.0_genc++"],

    generated_headers: ["android.hardware.audio@2.0_genc++_headers"],

    export_generated_headers: ["android.hardware.audio@2.0_genc++_headers"],

    vendor_available: true,

    vndk: {

        enabled: true,

    },

    shared_libs: [

        "libhidlbase",

        "libhidltransport",

        "libhwbinder",

        "liblog",

        "libutils",

        "libcutils",

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

    ],

    export_shared_lib_headers: [

        "libhidlbase",

        "libhidltransport",

        "libhwbinder",

        "libutils",

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

    ],

}



// This package is not java compatible. Not creating java target.



genrule {

    name: "android.hardware.audio-V2.0-java-constants_gen_java",

    tools: ["hidl-gen"],

    cmd: "$(location hidl-gen) -o $(genDir) -Ljava-constants -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.audio@2.0",

    srcs: [

        ":android.hardware.audio@2.0_hal",

    ],

    out: [

        "android/hardware/audio/V2_0/Constants.java",

    ],

}



java_library {

    name: "android.hardware.audio-V2.0-java-constants",

    no_framework_libs: true,

    defaults: ["hidl-java-module-defaults"],

    srcs: [":android.hardware.audio-V2.0-java-constants_gen_java"],

}



genrule {

    name: "android.hardware.audio@2.0-adapter-helper_genc++",

    tools: ["hidl-gen"],

    cmd: "$(location hidl-gen) -o $(genDir) -Lc++-adapter-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.audio@2.0",

    srcs: [

        ":android.hardware.audio@2.0_hal",

    ],

    out: [

        "android/hardware/audio/2.0/ADevice.cpp",

        "android/hardware/audio/2.0/ADevicesFactory.cpp",

        "android/hardware/audio/2.0/APrimaryDevice.cpp",

        "android/hardware/audio/2.0/AStream.cpp",

        "android/hardware/audio/2.0/AStreamIn.cpp",

        "android/hardware/audio/2.0/AStreamOut.cpp",

        "android/hardware/audio/2.0/AStreamOutCallback.cpp",

    ],

}



genrule {

    name: "android.hardware.audio@2.0-adapter-helper_genc++_headers",

    tools: ["hidl-gen"],

    cmd: "$(location hidl-gen) -o $(genDir) -Lc++-adapter-headers -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.audio@2.0",

    srcs: [

        ":android.hardware.audio@2.0_hal",

    ],

    out: [

        "android/hardware/audio/2.0/ADevice.h",

        "android/hardware/audio/2.0/ADevicesFactory.h",

        "android/hardware/audio/2.0/APrimaryDevice.h",

        "android/hardware/audio/2.0/AStream.h",

        "android/hardware/audio/2.0/AStreamIn.h",

        "android/hardware/audio/2.0/AStreamOut.h",

        "android/hardware/audio/2.0/AStreamOutCallback.h",

    ],

}



cc_library {

    name: "android.hardware.audio@2.0-adapter-helper",

    defaults: ["hidl-module-defaults"],

    generated_sources: ["android.hardware.audio@2.0-adapter-helper_genc++"],

    generated_headers: ["android.hardware.audio@2.0-adapter-helper_genc++_headers"],

    export_generated_headers: ["android.hardware.audio@2.0-adapter-helper_genc++_headers"],

    vendor_available: true,

    shared_libs: [

        "libhidlbase",

        "libhidltransport",

        "libhwbinder",

        "liblog",

        "libutils",

        "libcutils",

        "libhidladapter",

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

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

        "android.hardware.audio@2.0",

        "android.hidl.base@1.0",

        "android.hidl.base@1.0-adapter-helper",

    ],

    ],

    export_shared_lib_headers: [

    types: [

        "libhidlbase",

        "AudioDrain",

        "libhidltransport",

        "DeviceAddress",

        "libhwbinder",

        "MessageQueueFlagBits",

        "libutils",

        "MmapBufferInfo",

        "libhidladapter",

        "MmapPosition",

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

        "ParameterValue",

        "android.hardware.audio@2.0",

        "Result",

        "android.hidl.base@1.0-adapter-helper",

        "TimeSpec",

    ],

    ],

    gen_java: false,

    gen_java_constants: true,

}

}

genrule {

    name: "android.hardware.audio@2.0-adapter_genc++",

    tools: ["hidl-gen"],

    cmd: "$(location hidl-gen) -o $(genDir) -Lc++-adapter-main -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.audio@2.0",

    out: ["main.cpp"]

}



cc_test {

    name: "android.hardware.audio@2.0-adapter",

    defaults: ["hidl-module-defaults"],

    shared_libs: [

        "libhidladapter",

        "libhidlbase",

        "libhidltransport",

        "libutils",

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

        "android.hardware.audio@2.0",

        "android.hardware.audio@2.0-adapter-helper",

    ],

    generated_sources: ["android.hardware.audio@2.0-adapter_genc++"],

}

audio/common/2.0/Android.bp

+39 −72
Original line number Original line Diff line number Diff line 
// This file is autogenerated by hidl-gen. Do not edit manually.

// This file is autogenerated by hidl-gen -Landroidbp.





filegroup {

hidl_interface {

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

    srcs: [

        "types.hal",

    ],

}



genrule {

    name: "android.hardware.audio.common@2.0_genc++",

    tools: ["hidl-gen"],

    cmd: "$(location hidl-gen) -o $(genDir) -Lc++-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.audio.common@2.0",

    srcs: [

        ":android.hardware.audio.common@2.0_hal",

    ],

    out: [

        "android/hardware/audio/common/2.0/types.cpp",

    ],

}



genrule {

    name: "android.hardware.audio.common@2.0_genc++_headers",

    tools: ["hidl-gen"],

    cmd: "$(location hidl-gen) -o $(genDir) -Lc++-headers -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.audio.common@2.0",

    srcs: [

        ":android.hardware.audio.common@2.0_hal",

    ],

    out: [

        "android/hardware/audio/common/2.0/types.h",

        "android/hardware/audio/common/2.0/hwtypes.h",

    ],

}



cc_library {

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

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

    defaults: ["hidl-module-defaults"],

    root: "android.hardware",

    generated_sources: ["android.hardware.audio.common@2.0_genc++"],

    generated_headers: ["android.hardware.audio.common@2.0_genc++_headers"],

    export_generated_headers: ["android.hardware.audio.common@2.0_genc++_headers"],

    vendor_available: true,

    vndk: {

    vndk: {

        enabled: true,

        enabled: true,

    },

    },

    shared_libs: [

        "libhidlbase",

        "libhidltransport",

        "libhwbinder",

        "liblog",

        "libutils",

        "libcutils",

    ],

    export_shared_lib_headers: [

        "libhidlbase",

        "libhidltransport",

        "libhwbinder",

        "libutils",

    ],

}



// This package is not java compatible. Not creating java target.



genrule {

    name: "android.hardware.audio.common-V2.0-java-constants_gen_java",

    tools: ["hidl-gen"],

    cmd: "$(location hidl-gen) -o $(genDir) -Ljava-constants -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.audio.common@2.0",

    srcs: [

    srcs: [

        ":android.hardware.audio.common@2.0_hal",

        "types.hal",

    ],

    out: [

        "android/hardware/audio/common/V2_0/Constants.java",

    ],

    ],

    types: [

        "AudioChannelMask",

        "AudioConfig",

        "AudioDevice",

        "AudioFormat",

        "AudioGain",

        "AudioGainConfig",

        "AudioGainMode",

        "AudioHandleConsts",

        "AudioInputFlag",

        "AudioInterleave",

        "AudioMixLatencyClass",

        "AudioMode",

        "AudioOffloadInfo",

        "AudioOutputFlag",

        "AudioPort",

        "AudioPortConfig",

        "AudioPortConfigDeviceExt",

        "AudioPortConfigMask",

        "AudioPortConfigSessionExt",

        "AudioPortDeviceExt",

        "AudioPortMixExt",

        "AudioPortRole",

        "AudioPortSessionExt",

        "AudioPortType",

        "AudioSessionConsts",

        "AudioSource",

        "AudioStreamType",

        "AudioUsage",

        "FixedChannelCount",

        "ThreadInfo",

        "Uuid",

    ],

    gen_java: false,

    gen_java_constants: true,

}

}

java_library {

    name: "android.hardware.audio.common-V2.0-java-constants",

    no_framework_libs: true,

    defaults: ["hidl-java-module-defaults"],

    srcs: [":android.hardware.audio.common-V2.0-java-constants_gen_java"],

}

// This package has no interfaces. Not creating versioning adapter.

audio/effect/2.0/Android.bp

+26 −262

File changed.

Preview size limit exceeded, changes collapsed.

biometrics/fingerprint/2.1/Android.bp

+19 −174
Original line number Original line Diff line number Diff line 
// This file is autogenerated by hidl-gen. Do not edit manually.

// This file is autogenerated by hidl-gen -Landroidbp.





filegroup {

hidl_interface {

    name: "android.hardware.biometrics.fingerprint@2.1_hal",

    srcs: [

        "types.hal",

        "IBiometricsFingerprint.hal",

        "IBiometricsFingerprintClientCallback.hal",

    ],

}



genrule {

    name: "android.hardware.biometrics.fingerprint@2.1_genc++",

    tools: ["hidl-gen"],

    cmd: "$(location hidl-gen) -o $(genDir) -Lc++-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.biometrics.fingerprint@2.1",

    srcs: [

        ":android.hardware.biometrics.fingerprint@2.1_hal",

    ],

    out: [

        "android/hardware/biometrics/fingerprint/2.1/types.cpp",

        "android/hardware/biometrics/fingerprint/2.1/BiometricsFingerprintAll.cpp",

        "android/hardware/biometrics/fingerprint/2.1/BiometricsFingerprintClientCallbackAll.cpp",

    ],

}



genrule {

    name: "android.hardware.biometrics.fingerprint@2.1_genc++_headers",

    tools: ["hidl-gen"],

    cmd: "$(location hidl-gen) -o $(genDir) -Lc++-headers -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.biometrics.fingerprint@2.1",

    srcs: [

        ":android.hardware.biometrics.fingerprint@2.1_hal",

    ],

    out: [

        "android/hardware/biometrics/fingerprint/2.1/types.h",

        "android/hardware/biometrics/fingerprint/2.1/hwtypes.h",

        "android/hardware/biometrics/fingerprint/2.1/IBiometricsFingerprint.h",

        "android/hardware/biometrics/fingerprint/2.1/IHwBiometricsFingerprint.h",

        "android/hardware/biometrics/fingerprint/2.1/BnHwBiometricsFingerprint.h",

        "android/hardware/biometrics/fingerprint/2.1/BpHwBiometricsFingerprint.h",

        "android/hardware/biometrics/fingerprint/2.1/BsBiometricsFingerprint.h",

        "android/hardware/biometrics/fingerprint/2.1/IBiometricsFingerprintClientCallback.h",

        "android/hardware/biometrics/fingerprint/2.1/IHwBiometricsFingerprintClientCallback.h",

        "android/hardware/biometrics/fingerprint/2.1/BnHwBiometricsFingerprintClientCallback.h",

        "android/hardware/biometrics/fingerprint/2.1/BpHwBiometricsFingerprintClientCallback.h",

        "android/hardware/biometrics/fingerprint/2.1/BsBiometricsFingerprintClientCallback.h",

    ],

}



cc_library {

    name: "android.hardware.biometrics.fingerprint@2.1",

    name: "android.hardware.biometrics.fingerprint@2.1",

    defaults: ["hidl-module-defaults"],

    root: "android.hardware",

    generated_sources: ["android.hardware.biometrics.fingerprint@2.1_genc++"],

    generated_headers: ["android.hardware.biometrics.fingerprint@2.1_genc++_headers"],

    export_generated_headers: ["android.hardware.biometrics.fingerprint@2.1_genc++_headers"],

    vendor_available: true,

    vndk: {

    vndk: {

        enabled: true,

        enabled: true,

    },

    },

    shared_libs: [

        "libhidlbase",

        "libhidltransport",

        "libhwbinder",

        "liblog",

        "libutils",

        "libcutils",

    ],

    export_shared_lib_headers: [

        "libhidlbase",

        "libhidltransport",

        "libhwbinder",

        "libutils",

    ],

}



genrule {

    name: "android.hardware.biometrics.fingerprint-V2.1-java_gen_java",

    tools: ["hidl-gen"],

    cmd: "$(location hidl-gen) -o $(genDir) -Ljava -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.biometrics.fingerprint@2.1",

    srcs: [

    srcs: [

        ":android.hardware.biometrics.fingerprint@2.1_hal",

        "types.hal",

    ],

        "IBiometricsFingerprint.hal",

    out: [

        "IBiometricsFingerprintClientCallback.hal",

        "android/hardware/biometrics/fingerprint/V2_1/FingerprintAcquired.java",

        "android/hardware/biometrics/fingerprint/V2_1/FingerprintAcquiredInfo.java",

        "android/hardware/biometrics/fingerprint/V2_1/FingerprintAuthenticated.java",

        "android/hardware/biometrics/fingerprint/V2_1/FingerprintEnroll.java",

        "android/hardware/biometrics/fingerprint/V2_1/FingerprintError.java",

        "android/hardware/biometrics/fingerprint/V2_1/FingerprintFingerId.java",

        "android/hardware/biometrics/fingerprint/V2_1/FingerprintIterator.java",

        "android/hardware/biometrics/fingerprint/V2_1/FingerprintMsgType.java",

        "android/hardware/biometrics/fingerprint/V2_1/RequestStatus.java",

        "android/hardware/biometrics/fingerprint/V2_1/IBiometricsFingerprint.java",

        "android/hardware/biometrics/fingerprint/V2_1/IBiometricsFingerprintClientCallback.java",

    ],

}



java_library {

    name: "android.hardware.biometrics.fingerprint-V2.1-java",

    no_framework_libs: true,

    defaults: ["hidl-java-module-defaults"],

    srcs: [":android.hardware.biometrics.fingerprint-V2.1-java_gen_java"],

    libs: [

        "hwbinder",

        "android.hidl.base-V1.0-java",

    ]

}



// This package does not export any types. Not creating java constants export.





genrule {

    name: "android.hardware.biometrics.fingerprint@2.1-adapter-helper_genc++",

    tools: ["hidl-gen"],

    cmd: "$(location hidl-gen) -o $(genDir) -Lc++-adapter-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.biometrics.fingerprint@2.1",

    srcs: [

        ":android.hardware.biometrics.fingerprint@2.1_hal",

    ],

    out: [

        "android/hardware/biometrics/fingerprint/2.1/ABiometricsFingerprint.cpp",

        "android/hardware/biometrics/fingerprint/2.1/ABiometricsFingerprintClientCallback.cpp",

    ],

}



genrule {

    name: "android.hardware.biometrics.fingerprint@2.1-adapter-helper_genc++_headers",

    tools: ["hidl-gen"],

    cmd: "$(location hidl-gen) -o $(genDir) -Lc++-adapter-headers -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.biometrics.fingerprint@2.1",

    srcs: [

        ":android.hardware.biometrics.fingerprint@2.1_hal",

    ],

    ],

    out: [

    interfaces: [

        "android/hardware/biometrics/fingerprint/2.1/ABiometricsFingerprint.h",

        "android.hidl.base@1.0",

        "android/hardware/biometrics/fingerprint/2.1/ABiometricsFingerprintClientCallback.h",

    ],

    ],

}

    types: [



        "FingerprintAcquired",

cc_library {

        "FingerprintAcquiredInfo",

    name: "android.hardware.biometrics.fingerprint@2.1-adapter-helper",

        "FingerprintAuthenticated",

    defaults: ["hidl-module-defaults"],

        "FingerprintEnroll",

    generated_sources: ["android.hardware.biometrics.fingerprint@2.1-adapter-helper_genc++"],

        "FingerprintError",

    generated_headers: ["android.hardware.biometrics.fingerprint@2.1-adapter-helper_genc++_headers"],

        "FingerprintFingerId",

    export_generated_headers: ["android.hardware.biometrics.fingerprint@2.1-adapter-helper_genc++_headers"],

        "FingerprintIterator",

    vendor_available: true,

        "FingerprintMsgType",

    shared_libs: [

        "RequestStatus",

        "libhidlbase",

        "libhidltransport",

        "libhwbinder",

        "liblog",

        "libutils",

        "libcutils",

        "libhidladapter",

        "android.hardware.biometrics.fingerprint@2.1",

        "android.hidl.base@1.0-adapter-helper",

    ],

    ],

    export_shared_lib_headers: [

    gen_java: true,

        "libhidlbase",

        "libhidltransport",

        "libhwbinder",

        "libutils",

        "libhidladapter",

        "android.hardware.biometrics.fingerprint@2.1",

        "android.hidl.base@1.0-adapter-helper",

    ],

}



genrule {

    name: "android.hardware.biometrics.fingerprint@2.1-adapter_genc++",

    tools: ["hidl-gen"],

    cmd: "$(location hidl-gen) -o $(genDir) -Lc++-adapter-main -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.biometrics.fingerprint@2.1",

    out: ["main.cpp"]

}

}

cc_test {

    name: "android.hardware.biometrics.fingerprint@2.1-adapter",

    defaults: ["hidl-module-defaults"],

    shared_libs: [

        "libhidladapter",

        "libhidlbase",

        "libhidltransport",

        "libutils",

        "android.hardware.biometrics.fingerprint@2.1",

        "android.hardware.biometrics.fingerprint@2.1-adapter-helper",

    ],

    generated_sources: ["android.hardware.biometrics.fingerprint@2.1-adapter_genc++"],

}