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

Commit 2332ea35 authored by Colin Cross's avatar Colin Cross Committed by Android (Google) Code Review
Browse files

Merge "Support genrules with multiple tools"

parents bdab6137 b785f5b8

audio/2.0/Android.bp

+4 −4
Original line number Diff line number Diff line
@@ -2,8 +2,8 @@ 


genrule {

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

    tool: "hidl-gen",

    cmd: "$tool -o $genDir -Lc++ -randroid.hardware:hardware/interfaces android.hardware.audio@2.0",

    tools: ["hidl-gen"],

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

    srcs: [

        "types.hal",

        "IDevice.hal",
@@ -28,8 +28,8 @@ genrule { 


genrule {

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

    tool: "hidl-gen",

    cmd: "$tool -o $genDir -Lc++ -randroid.hardware:hardware/interfaces android.hardware.audio@2.0",

    tools: ["hidl-gen"],

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

    srcs: [

        "types.hal",

        "IDevice.hal",

audio/common/2.0/Android.bp

+4 −4
Original line number Diff line number Diff line
@@ -2,8 +2,8 @@ 


genrule {

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

    tool: "hidl-gen",

    cmd: "$tool -o $genDir -Lc++ -randroid.hardware:hardware/interfaces android.hardware.audio.common@2.0",

    tools: ["hidl-gen"],

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

    srcs: [

        "types.hal",

    ],
@@ -14,8 +14,8 @@ genrule { 


genrule {

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

    tool: "hidl-gen",

    cmd: "$tool -o $genDir -Lc++ -randroid.hardware:hardware/interfaces android.hardware.audio.common@2.0",

    tools: ["hidl-gen"],

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

    srcs: [

        "types.hal",

    ],

audio/effect/2.0/Android.bp

+4 −4
Original line number Diff line number Diff line
@@ -2,8 +2,8 @@ 


genrule {

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

    tool: "hidl-gen",

    cmd: "$tool -o $genDir -Lc++ -randroid.hardware:hardware/interfaces android.hardware.audio.effect@2.0",

    tools: ["hidl-gen"],

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

    srcs: [

        "types.hal",

        "IAcousticEchoCancelerEffect.hal",
@@ -42,8 +42,8 @@ genrule { 


genrule {

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

    tool: "hidl-gen",

    cmd: "$tool -o $genDir -Lc++ -randroid.hardware:hardware/interfaces android.hardware.audio.effect@2.0",

    tools: ["hidl-gen"],

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

    srcs: [

        "types.hal",

        "IAcousticEchoCancelerEffect.hal",

benchmarks/msgq/1.0/Android.bp

+4 −4
Original line number Diff line number Diff line
@@ -2,8 +2,8 @@ 


genrule {

    name: "android.hardware.benchmarks.msgq@1.0_genc++",

    tool: "hidl-gen",

    cmd: "$tool -o $genDir -Lc++ -randroid.hardware:hardware/interfaces android.hardware.benchmarks.msgq@1.0",

    tools: ["hidl-gen"],

    cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces android.hardware.benchmarks.msgq@1.0",

    srcs: [

        "IBenchmarkMsgQ.hal",

    ],
@@ -14,8 +14,8 @@ genrule { 


genrule {

    name: "android.hardware.benchmarks.msgq@1.0_genc++_headers",

    tool: "hidl-gen",

    cmd: "$tool -o $genDir -Lc++ -randroid.hardware:hardware/interfaces android.hardware.benchmarks.msgq@1.0",

    tools: ["hidl-gen"],

    cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces android.hardware.benchmarks.msgq@1.0",

    srcs: [

        "IBenchmarkMsgQ.hal",

    ],

biometrics/fingerprint/2.1/Android.bp

+4 −4
Original line number Diff line number Diff line
@@ -2,8 +2,8 @@ 


genrule {

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

    tool: "hidl-gen",

    cmd: "$tool -o $genDir -Lc++ -randroid.hardware:hardware/interfaces android.hardware.biometrics.fingerprint@2.1",

    tools: ["hidl-gen"],

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

    srcs: [

        "types.hal",

        "IBiometricsFingerprint.hal",
@@ -18,8 +18,8 @@ genrule { 


genrule {

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

    tool: "hidl-gen",

    cmd: "$tool -o $genDir -Lc++ -randroid.hardware:hardware/interfaces android.hardware.biometrics.fingerprint@2.1",

    tools: ["hidl-gen"],

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

    srcs: [

        "types.hal",

        "IBiometricsFingerprint.hal",