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

Commit 26a0bb27 authored by Steven Moreland's avatar Steven Moreland
Browse files

Update makefiles for hidl adapter. 

Bug: 37518178
Test: manual
Change-Id: I50e999907d3c64d2b039272b823971998da64d1b
parent 7728f0ce

audio/2.0/Android.bp

+88 −0
Original line number Diff line number Diff line
@@ -108,3 +108,91 @@ cc_library { 
        "android.hardware.audio.common@2.0",

    ],

}



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

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

    ],

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

    ],

}



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

    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/effect/2.0/Android.bp

+102 −0
Original line number Diff line number Diff line
@@ -157,3 +157,105 @@ cc_library { 
        "android.hardware.audio.common@2.0",

    ],

}



genrule {

    name: "android.hardware.audio.effect@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.effect@2.0",

    srcs: [

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

    ],

    out: [

        "android/hardware/audio/effect/2.0/AAcousticEchoCancelerEffect.cpp",

        "android/hardware/audio/effect/2.0/AAutomaticGainControlEffect.cpp",

        "android/hardware/audio/effect/2.0/ABassBoostEffect.cpp",

        "android/hardware/audio/effect/2.0/ADownmixEffect.cpp",

        "android/hardware/audio/effect/2.0/AEffect.cpp",

        "android/hardware/audio/effect/2.0/AEffectBufferProviderCallback.cpp",

        "android/hardware/audio/effect/2.0/AEffectsFactory.cpp",

        "android/hardware/audio/effect/2.0/AEnvironmentalReverbEffect.cpp",

        "android/hardware/audio/effect/2.0/AEqualizerEffect.cpp",

        "android/hardware/audio/effect/2.0/ALoudnessEnhancerEffect.cpp",

        "android/hardware/audio/effect/2.0/ANoiseSuppressionEffect.cpp",

        "android/hardware/audio/effect/2.0/APresetReverbEffect.cpp",

        "android/hardware/audio/effect/2.0/AVirtualizerEffect.cpp",

        "android/hardware/audio/effect/2.0/AVisualizerEffect.cpp",

    ],

}



genrule {

    name: "android.hardware.audio.effect@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.effect@2.0",

    srcs: [

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

    ],

    out: [

        "android/hardware/audio/effect/2.0/AAcousticEchoCancelerEffect.h",

        "android/hardware/audio/effect/2.0/AAutomaticGainControlEffect.h",

        "android/hardware/audio/effect/2.0/ABassBoostEffect.h",

        "android/hardware/audio/effect/2.0/ADownmixEffect.h",

        "android/hardware/audio/effect/2.0/AEffect.h",

        "android/hardware/audio/effect/2.0/AEffectBufferProviderCallback.h",

        "android/hardware/audio/effect/2.0/AEffectsFactory.h",

        "android/hardware/audio/effect/2.0/AEnvironmentalReverbEffect.h",

        "android/hardware/audio/effect/2.0/AEqualizerEffect.h",

        "android/hardware/audio/effect/2.0/ALoudnessEnhancerEffect.h",

        "android/hardware/audio/effect/2.0/ANoiseSuppressionEffect.h",

        "android/hardware/audio/effect/2.0/APresetReverbEffect.h",

        "android/hardware/audio/effect/2.0/AVirtualizerEffect.h",

        "android/hardware/audio/effect/2.0/AVisualizerEffect.h",

    ],

}





cc_library {

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

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

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

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

    export_generated_headers: ["android.hardware.audio.effect@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.effect@2.0",

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

    ],

    export_shared_lib_headers: [

        "libhidlbase",

        "libhidltransport",

        "libhwbinder",

        "libutils",

        "libhidladapter",

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

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

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

    ],

}



genrule {

    name: "android.hardware.audio.effect@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.effect@2.0",

    out: ["main.cpp"]}



cc_test {

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

    shared_libs: [

        "libhidladapter",

        "libhidlbase",

        "libhidltransport",

        "libutils",

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

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

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

    ],

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

}

automotive/evs/1.0/Android.bp

+79 −0
Original line number Diff line number Diff line
@@ -85,3 +85,82 @@ cc_library { 
        "libutils",

    ],

}



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

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

}

automotive/vehicle/2.0/Android.bp

+75 −0
Original line number Diff line number Diff line
@@ -71,3 +71,78 @@ cc_library { 
        "libutils",

    ],

}



genrule {

    name: "android.hardware.automotive.vehicle@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.automotive.vehicle@2.0",

    srcs: [

        ":android.hardware.automotive.vehicle@2.0_hal",

    ],

    out: [

        "android/hardware/automotive/vehicle/2.0/AVehicle.cpp",

        "android/hardware/automotive/vehicle/2.0/AVehicleCallback.cpp",

    ],

}



genrule {

    name: "android.hardware.automotive.vehicle@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.automotive.vehicle@2.0",

    srcs: [

        ":android.hardware.automotive.vehicle@2.0_hal",

    ],

    out: [

        "android/hardware/automotive/vehicle/2.0/AVehicle.h",

        "android/hardware/automotive/vehicle/2.0/AVehicleCallback.h",

    ],

}





cc_library {

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

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

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

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

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

    vendor_available: true,

    shared_libs: [

        "libhidlbase",

        "libhidltransport",

        "libhwbinder",

        "liblog",

        "libutils",

        "libcutils",

        "libhidladapter",

        "android.hardware.automotive.vehicle@2.0",

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

    ],

    export_shared_lib_headers: [

        "libhidlbase",

        "libhidltransport",

        "libhwbinder",

        "libutils",

        "libhidladapter",

        "android.hardware.automotive.vehicle@2.0",

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

    ],

}



genrule {

    name: "android.hardware.automotive.vehicle@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.automotive.vehicle@2.0",

    out: ["main.cpp"]}



cc_test {

    name: "android.hardware.automotive.vehicle@2.0-adapter",

    shared_libs: [

        "libhidladapter",

        "libhidlbase",

        "libhidltransport",

        "libutils",

        "android.hardware.automotive.vehicle@2.0",

        "android.hardware.automotive.vehicle@2.0-adapter-helper",

    ],

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

}

biometrics/fingerprint/2.1/Android.bp

+75 −0
Original line number Diff line number Diff line
@@ -71,3 +71,78 @@ cc_library { 
        "libutils",

    ],

}



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

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

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

    ],

}





cc_library {

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

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

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

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

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

    vendor_available: true,

    shared_libs: [

        "libhidlbase",

        "libhidltransport",

        "libhwbinder",

        "liblog",

        "libutils",

        "libcutils",

        "libhidladapter",

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

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

    ],

    export_shared_lib_headers: [

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

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

}