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

Commit e803ecf8 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Updating makefiles for hidl_interface." into oc-mr1-dev-plus-aosp

parents a9a2b287 c2f829a1

Android.bp

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

]



hidl_package_root {

    name: "android.hardware",

    path: "hardware/interfaces",

}



cc_defaults {

    name: "hidl_defaults",

    cflags: [

audio/2.0/Android.bp

+20 −204
Original line number 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 {

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

hidl_interface {

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

    root: "android.hardware",

    vndk: {

        enabled: true,

    },

    srcs: [

        "types.hal",

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

        "IStreamOutCallback.hal",

    ],

}



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",

    interfaces: [

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

        "android.hardware.audio@2.0",

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

        "android.hidl.base@1.0",

    ],

    export_shared_lib_headers: [

        "libhidlbase",

        "libhidltransport",

        "libhwbinder",

        "libutils",

        "libhidladapter",

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

        "android.hardware.audio@2.0",

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

    types: [

        "AudioDrain",

        "DeviceAddress",

        "MessageQueueFlagBits",

        "MmapBufferInfo",

        "MmapPosition",

        "ParameterValue",

        "Result",

        "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 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 {

    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 {

hidl_interface {

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

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

    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,

    root: "android.hardware",

    vndk: {

        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: [

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

    ],

    out: [

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

        "types.hal",

    ],

    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.

automotive/evs/1.0/Android.bp

+16 −156
Original line number 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 {

    name: "android.hardware.automotive.evs@1.0_hal",

hidl_interface {

    name: "android.hardware.automotive.evs@1.0",

    root: "android.hardware",

    vndk: {

        enabled: true,

    },

    srcs: [

        "types.hal",

        "IEvsCamera.hal",
@@ -9,160 +13,16 @@ filegroup { 
        "IEvsDisplay.hal",

        "IEvsEnumerator.hal",

    ],

}



genrule {

    name: "android.hardware.automotive.evs@1.0_genc++",

    tools: ["hidl-gen"],

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

    srcs: [

        ":android.hardware.automotive.evs@1.0_hal",

    ],

    out: [

        "android/hardware/automotive/evs/1.0/types.cpp",

        "android/hardware/automotive/evs/1.0/EvsCameraAll.cpp",

        "android/hardware/automotive/evs/1.0/EvsCameraStreamAll.cpp",

        "android/hardware/automotive/evs/1.0/EvsDisplayAll.cpp",

        "android/hardware/automotive/evs/1.0/EvsEnumeratorAll.cpp",

    ],

}



genrule {

    name: "android.hardware.automotive.evs@1.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.automotive.evs@1.0",

    srcs: [

        ":android.hardware.automotive.evs@1.0_hal",

    ],

    out: [

        "android/hardware/automotive/evs/1.0/types.h",

        "android/hardware/automotive/evs/1.0/hwtypes.h",

        "android/hardware/automotive/evs/1.0/IEvsCamera.h",

        "android/hardware/automotive/evs/1.0/IHwEvsCamera.h",

        "android/hardware/automotive/evs/1.0/BnHwEvsCamera.h",

        "android/hardware/automotive/evs/1.0/BpHwEvsCamera.h",

        "android/hardware/automotive/evs/1.0/BsEvsCamera.h",

        "android/hardware/automotive/evs/1.0/IEvsCameraStream.h",

        "android/hardware/automotive/evs/1.0/IHwEvsCameraStream.h",

        "android/hardware/automotive/evs/1.0/BnHwEvsCameraStream.h",

        "android/hardware/automotive/evs/1.0/BpHwEvsCameraStream.h",

        "android/hardware/automotive/evs/1.0/BsEvsCameraStream.h",

        "android/hardware/automotive/evs/1.0/IEvsDisplay.h",

        "android/hardware/automotive/evs/1.0/IHwEvsDisplay.h",

        "android/hardware/automotive/evs/1.0/BnHwEvsDisplay.h",

        "android/hardware/automotive/evs/1.0/BpHwEvsDisplay.h",

        "android/hardware/automotive/evs/1.0/BsEvsDisplay.h",

        "android/hardware/automotive/evs/1.0/IEvsEnumerator.h",

        "android/hardware/automotive/evs/1.0/IHwEvsEnumerator.h",

        "android/hardware/automotive/evs/1.0/BnHwEvsEnumerator.h",

        "android/hardware/automotive/evs/1.0/BpHwEvsEnumerator.h",

        "android/hardware/automotive/evs/1.0/BsEvsEnumerator.h",

    ],

}



cc_library {

    name: "android.hardware.automotive.evs@1.0",

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

    generated_sources: ["android.hardware.automotive.evs@1.0_genc++"],

    generated_headers: ["android.hardware.automotive.evs@1.0_genc++_headers"],

    export_generated_headers: ["android.hardware.automotive.evs@1.0_genc++_headers"],

    vendor_available: true,

    vndk: {

        enabled: true,

    },

    shared_libs: [

        "libhidlbase",

        "libhidltransport",

        "libhwbinder",

        "liblog",

        "libutils",

        "libcutils",

    interfaces: [

        "android.hidl.base@1.0",

    ],

    export_shared_lib_headers: [

        "libhidlbase",

        "libhidltransport",

        "libhwbinder",

        "libutils",

    types: [

        "BufferDesc",

        "CameraDesc",

        "DisplayDesc",

        "DisplayState",

        "EvsResult",

    ],

    gen_java: false,

}

genrule {

    name: "android.hardware.automotive.evs@1.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.automotive.evs@1.0",

    srcs: [

        ":android.hardware.automotive.evs@1.0_hal",

    ],

    out: [

        "android/hardware/automotive/evs/1.0/AEvsCamera.cpp",

        "android/hardware/automotive/evs/1.0/AEvsCameraStream.cpp",

        "android/hardware/automotive/evs/1.0/AEvsDisplay.cpp",

        "android/hardware/automotive/evs/1.0/AEvsEnumerator.cpp",

    ],

}



genrule {

    name: "android.hardware.automotive.evs@1.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.automotive.evs@1.0",

    srcs: [

        ":android.hardware.automotive.evs@1.0_hal",

    ],

    out: [

        "android/hardware/automotive/evs/1.0/AEvsCamera.h",

        "android/hardware/automotive/evs/1.0/AEvsCameraStream.h",

        "android/hardware/automotive/evs/1.0/AEvsDisplay.h",

        "android/hardware/automotive/evs/1.0/AEvsEnumerator.h",

    ],

}





cc_library {

    name: "android.hardware.automotive.evs@1.0-adapter-helper",

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

    generated_sources: ["android.hardware.automotive.evs@1.0-adapter-helper_genc++"],

    generated_headers: ["android.hardware.automotive.evs@1.0-adapter-helper_genc++_headers"],

    export_generated_headers: ["android.hardware.automotive.evs@1.0-adapter-helper_genc++_headers"],

    vendor_available: true,

    shared_libs: [

        "libhidlbase",

        "libhidltransport",

        "libhwbinder",

        "liblog",

        "libutils",

        "libcutils",

        "libhidladapter",

        "android.hardware.automotive.evs@1.0",

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

    ],

    export_shared_lib_headers: [

        "libhidlbase",

        "libhidltransport",

        "libhwbinder",

        "libutils",

        "libhidladapter",

        "android.hardware.automotive.evs@1.0",

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

    ],

}



genrule {

    name: "android.hardware.automotive.evs@1.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.automotive.evs@1.0",

    out: ["main.cpp"]

}



cc_test {

    name: "android.hardware.automotive.evs@1.0-adapter",

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

    shared_libs: [

        "libhidladapter",

        "libhidlbase",

        "libhidltransport",

        "libutils",

        "android.hardware.automotive.evs@1.0",

        "android.hardware.automotive.evs@1.0-adapter-helper",

    ],

    generated_sources: ["android.hardware.automotive.evs@1.0-adapter_genc++"],

}