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

Commit ebfd470b authored by Colin Cross's avatar Colin Cross Committed by android-build-merger
Browse files

Merge "Support genrules with multiple tools" am: 5222c477 am: 1d1e63b8

am: 8fcd3c6d

Change-Id: Id054d14ebb3e7e6a1e16ccddc1861443cbbc89cf
parents 7cf25e0d 8fcd3c6d
Loading
Loading
Loading
Loading
+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",
    ],
+4 −4
Original line number Diff line number Diff line
@@ -2,8 +2,8 @@

genrule {
    name: "android.hardware.bluetooth@1.0_genc++",
    tool: "hidl-gen",
    cmd: "$tool -o $genDir -Lc++ -randroid.hardware:hardware/interfaces android.hardware.bluetooth@1.0",
    tools: ["hidl-gen"],
    cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces android.hardware.bluetooth@1.0",
    srcs: [
        "types.hal",
        "IBluetoothHci.hal",
@@ -18,8 +18,8 @@ genrule {

genrule {
    name: "android.hardware.bluetooth@1.0_genc++_headers",
    tool: "hidl-gen",
    cmd: "$tool -o $genDir -Lc++ -randroid.hardware:hardware/interfaces android.hardware.bluetooth@1.0",
    tools: ["hidl-gen"],
    cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces android.hardware.bluetooth@1.0",
    srcs: [
        "types.hal",
        "IBluetoothHci.hal",
+4 −4
Original line number Diff line number Diff line
@@ -2,8 +2,8 @@

genrule {
    name: "android.hardware.boot@1.0_genc++",
    tool: "hidl-gen",
    cmd: "$tool -o $genDir -Lc++ -randroid.hardware:hardware/interfaces android.hardware.boot@1.0",
    tools: ["hidl-gen"],
    cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces android.hardware.boot@1.0",
    srcs: [
        "types.hal",
        "IBootControl.hal",
@@ -16,8 +16,8 @@ genrule {

genrule {
    name: "android.hardware.boot@1.0_genc++_headers",
    tool: "hidl-gen",
    cmd: "$tool -o $genDir -Lc++ -randroid.hardware:hardware/interfaces android.hardware.boot@1.0",
    tools: ["hidl-gen"],
    cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces android.hardware.boot@1.0",
    srcs: [
        "types.hal",
        "IBootControl.hal",
+4 −4
Original line number Diff line number Diff line
@@ -2,8 +2,8 @@

genrule {
    name: "android.hardware.nfc@1.0_genc++",
    tool: "hidl-gen",
    cmd: "$tool -o $genDir -Lc++ -randroid.hardware:hardware/interfaces android.hardware.nfc@1.0",
    tools: ["hidl-gen"],
    cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces android.hardware.nfc@1.0",
    srcs: [
        "types.hal",
        "INfc.hal",
@@ -18,8 +18,8 @@ genrule {

genrule {
    name: "android.hardware.nfc@1.0_genc++_headers",
    tool: "hidl-gen",
    cmd: "$tool -o $genDir -Lc++ -randroid.hardware:hardware/interfaces android.hardware.nfc@1.0",
    tools: ["hidl-gen"],
    cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces android.hardware.nfc@1.0",
    srcs: [
        "types.hal",
        "INfc.hal",
+4 −4
Original line number Diff line number Diff line
@@ -2,8 +2,8 @@

genrule {
    name: "android.hardware.radio@1.0_genc++",
    tool: "hidl-gen",
    cmd: "$tool -o $genDir -Lc++ -randroid.hardware:hardware/interfaces android.hardware.radio@1.0",
    tools: ["hidl-gen"],
    cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces android.hardware.radio@1.0",
    srcs: [
        "types.hal",
        "IRadio.hal",
@@ -24,8 +24,8 @@ genrule {

genrule {
    name: "android.hardware.radio@1.0_genc++_headers",
    tool: "hidl-gen",
    cmd: "$tool -o $genDir -Lc++ -randroid.hardware:hardware/interfaces android.hardware.radio@1.0",
    tools: ["hidl-gen"],
    cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces android.hardware.radio@1.0",
    srcs: [
        "types.hal",
        "IRadio.hal",
Loading