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

Commit 50183949 authored by Yifan Hong's avatar Yifan Hong
Browse files

Update makefiles for hidlizing IBase. 

A new dependency android.hidl.base@1.0 is added for
all projects.

Test: mma

Change-Id: Ia70d0eb0d74de06475a339698386d383d491a43a
parent 0bd75e02

audio/2.0/Android.bp

+4 −2
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 
genrule {

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

    tools: ["hidl-gen"],

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

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

    srcs: [

        "types.hal",

        "IDevice.hal",
@@ -29,7 +29,7 @@ genrule { 
genrule {

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

    tools: ["hidl-gen"],

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

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

    srcs: [

        "types.hal",

        "IDevice.hal",
@@ -93,6 +93,7 @@ cc_library_shared { 
        "libutils",

        "libcutils",

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

        "android.hidl.base@1.0",

    ],

    export_shared_lib_headers: [

        "libhidlbase",
@@ -100,5 +101,6 @@ cc_library_shared { 
        "libhwbinder",

        "libutils",

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

        "android.hidl.base@1.0",

    ],

}

audio/2.0/Android.mk

+3 −1
Original line number Diff line number Diff line
@@ -27,7 +27,9 @@ $(GEN): PRIVATE_HIDL := $(HIDL) 
$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)

$(GEN): PRIVATE_CUSTOM_TOOL = \

        $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \

        -Ljava-constants -randroid.hardware:hardware/interfaces \

        -Ljava-constants \

        -randroid.hardware:hardware/interfaces \

        -randroid.hidl:system/libhidl/transport \

        android.hardware.audio@2.0



$(GEN):

audio/common/2.0/Android.bp

+2 −2
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 
genrule {

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

    tools: ["hidl-gen"],

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

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

    srcs: [

        "types.hal",

    ],
@@ -15,7 +15,7 @@ genrule { 
genrule {

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

    tools: ["hidl-gen"],

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

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

    srcs: [

        "types.hal",

    ],

audio/common/2.0/Android.mk

+3 −1
Original line number Diff line number Diff line
@@ -20,7 +20,9 @@ $(GEN): PRIVATE_HIDL := $(HIDL) 
$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)

$(GEN): PRIVATE_CUSTOM_TOOL = \

        $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \

        -Ljava-constants -randroid.hardware:hardware/interfaces \

        -Ljava-constants \

        -randroid.hardware:hardware/interfaces \

        -randroid.hidl:system/libhidl/transport \

        android.hardware.audio.common@2.0



$(GEN):

audio/effect/2.0/Android.bp

+4 −2
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 
genrule {

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

    tools: ["hidl-gen"],

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

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

    srcs: [

        "types.hal",

        "IAcousticEchoCancelerEffect.hal",
@@ -43,7 +43,7 @@ genrule { 
genrule {

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

    tools: ["hidl-gen"],

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

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

    srcs: [

        "types.hal",

        "IAcousticEchoCancelerEffect.hal",
@@ -149,6 +149,7 @@ cc_library_shared { 
        "libutils",

        "libcutils",

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

        "android.hidl.base@1.0",

    ],

    export_shared_lib_headers: [

        "libhidlbase",
@@ -156,5 +157,6 @@ cc_library_shared { 
        "libhwbinder",

        "libutils",

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

        "android.hidl.base@1.0",

    ],

}