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

Commit e19e582b 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.

Also updated Android.mk for NFC hal (for java constants)

Test: mma

Change-Id: Ia70d0eb0d74de06475a339698386d383d491a43a
parent 2ed821d5

benchmarks/msgq/1.0/Android.bp

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

genrule {

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

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

    tools: ["hidl-gen"],

    tools: ["hidl-gen"],

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

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

    srcs: [

    srcs: [

        "IBenchmarkMsgQ.hal",

        "IBenchmarkMsgQ.hal",

    ],

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

genrule {

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

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

    tools: ["hidl-gen"],

    tools: ["hidl-gen"],

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

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

    srcs: [

    srcs: [

        "IBenchmarkMsgQ.hal",

        "IBenchmarkMsgQ.hal",

    ],

    ],
@@ -40,11 +40,13 @@ cc_library_shared { 
        "liblog",

        "liblog",

        "libutils",

        "libutils",

        "libcutils",

        "libcutils",

        "android.hidl.base@1.0",

    ],

    ],

    export_shared_lib_headers: [

    export_shared_lib_headers: [

        "libhidlbase",

        "libhidlbase",

        "libhidltransport",

        "libhidltransport",

        "libhwbinder",

        "libhwbinder",

        "libutils",

        "libutils",

        "android.hidl.base@1.0",

    ],

    ],

}
 
}

bluetooth/1.0/Android.bp

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

genrule {

    name: "android.hardware.bluetooth@1.0_genc++",

    name: "android.hardware.bluetooth@1.0_genc++",

    tools: ["hidl-gen"],

    tools: ["hidl-gen"],

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

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

    srcs: [

    srcs: [

        "types.hal",

        "types.hal",

        "IBluetoothHci.hal",

        "IBluetoothHci.hal",
@@ -19,7 +19,7 @@ genrule { 
genrule {

genrule {

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

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

    tools: ["hidl-gen"],

    tools: ["hidl-gen"],

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

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

    srcs: [

    srcs: [

        "types.hal",

        "types.hal",

        "IBluetoothHci.hal",

        "IBluetoothHci.hal",
@@ -52,11 +52,13 @@ cc_library_shared { 
        "liblog",

        "liblog",

        "libutils",

        "libutils",

        "libcutils",

        "libcutils",

        "android.hidl.base@1.0",

    ],

    ],

    export_shared_lib_headers: [

    export_shared_lib_headers: [

        "libhidlbase",

        "libhidlbase",

        "libhidltransport",

        "libhidltransport",

        "libhwbinder",

        "libhwbinder",

        "libutils",

        "libutils",

        "android.hidl.base@1.0",

    ],

    ],

}
 
}

bluetooth/1.0/Android.mk

+26 −6
Original line number Original line Diff line number Diff line
@@ -12,6 +12,10 @@ intermediates := $(local-generated-sources-dir) 




HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX)

HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX)





LOCAL_JAVA_LIBRARIES := \

    android.hidl.base@1.0-java \





#

#

# Build types.hal (Status)

# Build types.hal (Status)

#

#
@@ -22,7 +26,9 @@ $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal 
$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)

$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)

$(GEN): PRIVATE_CUSTOM_TOOL = \

$(GEN): PRIVATE_CUSTOM_TOOL = \

        $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \

        $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \

        -Ljava -randroid.hardware:hardware/interfaces \

        -Ljava \

        -randroid.hardware:hardware/interfaces \

        -randroid.hidl:system/libhidl/transport \

        android.hardware.bluetooth@1.0::types.Status

        android.hardware.bluetooth@1.0::types.Status





$(GEN): $(LOCAL_PATH)/types.hal

$(GEN): $(LOCAL_PATH)/types.hal
@@ -43,7 +49,9 @@ $(GEN): $(LOCAL_PATH)/types.hal 
$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)

$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)

$(GEN): PRIVATE_CUSTOM_TOOL = \

$(GEN): PRIVATE_CUSTOM_TOOL = \

        $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \

        $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \

        -Ljava -randroid.hardware:hardware/interfaces \

        -Ljava \

        -randroid.hardware:hardware/interfaces \

        -randroid.hidl:system/libhidl/transport \

        android.hardware.bluetooth@1.0::IBluetoothHci

        android.hardware.bluetooth@1.0::IBluetoothHci





$(GEN): $(LOCAL_PATH)/IBluetoothHci.hal

$(GEN): $(LOCAL_PATH)/IBluetoothHci.hal
@@ -62,7 +70,9 @@ $(GEN): $(LOCAL_PATH)/types.hal 
$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)

$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)

$(GEN): PRIVATE_CUSTOM_TOOL = \

$(GEN): PRIVATE_CUSTOM_TOOL = \

        $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \

        $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \

        -Ljava -randroid.hardware:hardware/interfaces \

        -Ljava \

        -randroid.hardware:hardware/interfaces \

        -randroid.hidl:system/libhidl/transport \

        android.hardware.bluetooth@1.0::IBluetoothHciCallbacks

        android.hardware.bluetooth@1.0::IBluetoothHciCallbacks





$(GEN): $(LOCAL_PATH)/IBluetoothHciCallbacks.hal

$(GEN): $(LOCAL_PATH)/IBluetoothHciCallbacks.hal
@@ -81,6 +91,10 @@ intermediates := $(local-generated-sources-dir) 




HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX)

HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX)





LOCAL_STATIC_JAVA_LIBRARIES := \

    android.hidl.base@1.0-java-static \





#

#

# Build types.hal (Status)

# Build types.hal (Status)

#

#
@@ -91,7 +105,9 @@ $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal 
$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)

$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)

$(GEN): PRIVATE_CUSTOM_TOOL = \

$(GEN): PRIVATE_CUSTOM_TOOL = \

        $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \

        $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \

        -Ljava -randroid.hardware:hardware/interfaces \

        -Ljava \

        -randroid.hardware:hardware/interfaces \

        -randroid.hidl:system/libhidl/transport \

        android.hardware.bluetooth@1.0::types.Status

        android.hardware.bluetooth@1.0::types.Status





$(GEN): $(LOCAL_PATH)/types.hal

$(GEN): $(LOCAL_PATH)/types.hal
@@ -112,7 +128,9 @@ $(GEN): $(LOCAL_PATH)/types.hal 
$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)

$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)

$(GEN): PRIVATE_CUSTOM_TOOL = \

$(GEN): PRIVATE_CUSTOM_TOOL = \

        $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \

        $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \

        -Ljava -randroid.hardware:hardware/interfaces \

        -Ljava \

        -randroid.hardware:hardware/interfaces \

        -randroid.hidl:system/libhidl/transport \

        android.hardware.bluetooth@1.0::IBluetoothHci

        android.hardware.bluetooth@1.0::IBluetoothHci





$(GEN): $(LOCAL_PATH)/IBluetoothHci.hal

$(GEN): $(LOCAL_PATH)/IBluetoothHci.hal
@@ -131,7 +149,9 @@ $(GEN): $(LOCAL_PATH)/types.hal 
$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)

$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)

$(GEN): PRIVATE_CUSTOM_TOOL = \

$(GEN): PRIVATE_CUSTOM_TOOL = \

        $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \

        $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \

        -Ljava -randroid.hardware:hardware/interfaces \

        -Ljava \

        -randroid.hardware:hardware/interfaces \

        -randroid.hidl:system/libhidl/transport \

        android.hardware.bluetooth@1.0::IBluetoothHciCallbacks

        android.hardware.bluetooth@1.0::IBluetoothHciCallbacks





$(GEN): $(LOCAL_PATH)/IBluetoothHciCallbacks.hal

$(GEN): $(LOCAL_PATH)/IBluetoothHciCallbacks.hal

boot/1.0/Android.bp

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

genrule {

    name: "android.hardware.boot@1.0_genc++",

    name: "android.hardware.boot@1.0_genc++",

    tools: ["hidl-gen"],

    tools: ["hidl-gen"],

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

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

    srcs: [

    srcs: [

        "types.hal",

        "types.hal",

        "IBootControl.hal",

        "IBootControl.hal",
@@ -17,7 +17,7 @@ genrule { 
genrule {

genrule {

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

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

    tools: ["hidl-gen"],

    tools: ["hidl-gen"],

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

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

    srcs: [

    srcs: [

        "types.hal",

        "types.hal",

        "IBootControl.hal",

        "IBootControl.hal",
@@ -44,11 +44,13 @@ cc_library_shared { 
        "liblog",

        "liblog",

        "libutils",

        "libutils",

        "libcutils",

        "libcutils",

        "android.hidl.base@1.0",

    ],

    ],

    export_shared_lib_headers: [

    export_shared_lib_headers: [

        "libhidlbase",

        "libhidlbase",

        "libhidltransport",

        "libhidltransport",

        "libhwbinder",

        "libhwbinder",

        "libutils",

        "libutils",

        "android.hidl.base@1.0",

    ],

    ],

}
 
}

boot/1.0/Android.mk

+26 −6
Original line number Original line Diff line number Diff line
@@ -12,6 +12,10 @@ intermediates := $(local-generated-sources-dir) 




HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX)

HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX)





LOCAL_JAVA_LIBRARIES := \

    android.hidl.base@1.0-java \





#

#

# Build types.hal (BoolResult)

# Build types.hal (BoolResult)

#

#
@@ -22,7 +26,9 @@ $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal 
$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)

$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)

$(GEN): PRIVATE_CUSTOM_TOOL = \

$(GEN): PRIVATE_CUSTOM_TOOL = \

        $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \

        $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \

        -Ljava -randroid.hardware:hardware/interfaces \

        -Ljava \

        -randroid.hardware:hardware/interfaces \

        -randroid.hidl:system/libhidl/transport \

        android.hardware.boot@1.0::types.BoolResult

        android.hardware.boot@1.0::types.BoolResult





$(GEN): $(LOCAL_PATH)/types.hal

$(GEN): $(LOCAL_PATH)/types.hal
@@ -39,7 +45,9 @@ $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal 
$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)

$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)

$(GEN): PRIVATE_CUSTOM_TOOL = \

$(GEN): PRIVATE_CUSTOM_TOOL = \

        $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \

        $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \

        -Ljava -randroid.hardware:hardware/interfaces \

        -Ljava \

        -randroid.hardware:hardware/interfaces \

        -randroid.hidl:system/libhidl/transport \

        android.hardware.boot@1.0::types.CommandResult

        android.hardware.boot@1.0::types.CommandResult





$(GEN): $(LOCAL_PATH)/types.hal

$(GEN): $(LOCAL_PATH)/types.hal
@@ -58,7 +66,9 @@ $(GEN): $(LOCAL_PATH)/types.hal 
$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)

$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)

$(GEN): PRIVATE_CUSTOM_TOOL = \

$(GEN): PRIVATE_CUSTOM_TOOL = \

        $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \

        $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \

        -Ljava -randroid.hardware:hardware/interfaces \

        -Ljava \

        -randroid.hardware:hardware/interfaces \

        -randroid.hidl:system/libhidl/transport \

        android.hardware.boot@1.0::IBootControl

        android.hardware.boot@1.0::IBootControl





$(GEN): $(LOCAL_PATH)/IBootControl.hal

$(GEN): $(LOCAL_PATH)/IBootControl.hal
@@ -77,6 +87,10 @@ intermediates := $(local-generated-sources-dir) 




HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX)

HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX)





LOCAL_STATIC_JAVA_LIBRARIES := \

    android.hidl.base@1.0-java-static \





#

#

# Build types.hal (BoolResult)

# Build types.hal (BoolResult)

#

#
@@ -87,7 +101,9 @@ $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal 
$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)

$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)

$(GEN): PRIVATE_CUSTOM_TOOL = \

$(GEN): PRIVATE_CUSTOM_TOOL = \

        $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \

        $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \

        -Ljava -randroid.hardware:hardware/interfaces \

        -Ljava \

        -randroid.hardware:hardware/interfaces \

        -randroid.hidl:system/libhidl/transport \

        android.hardware.boot@1.0::types.BoolResult

        android.hardware.boot@1.0::types.BoolResult





$(GEN): $(LOCAL_PATH)/types.hal

$(GEN): $(LOCAL_PATH)/types.hal
@@ -104,7 +120,9 @@ $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal 
$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)

$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)

$(GEN): PRIVATE_CUSTOM_TOOL = \

$(GEN): PRIVATE_CUSTOM_TOOL = \

        $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \

        $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \

        -Ljava -randroid.hardware:hardware/interfaces \

        -Ljava \

        -randroid.hardware:hardware/interfaces \

        -randroid.hidl:system/libhidl/transport \

        android.hardware.boot@1.0::types.CommandResult

        android.hardware.boot@1.0::types.CommandResult





$(GEN): $(LOCAL_PATH)/types.hal

$(GEN): $(LOCAL_PATH)/types.hal
@@ -123,7 +141,9 @@ $(GEN): $(LOCAL_PATH)/types.hal 
$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)

$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)

$(GEN): PRIVATE_CUSTOM_TOOL = \

$(GEN): PRIVATE_CUSTOM_TOOL = \

        $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \

        $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \

        -Ljava -randroid.hardware:hardware/interfaces \

        -Ljava \

        -randroid.hardware:hardware/interfaces \

        -randroid.hidl:system/libhidl/transport \

        android.hardware.boot@1.0::IBootControl

        android.hardware.boot@1.0::IBootControl





$(GEN): $(LOCAL_PATH)/IBootControl.hal

$(GEN): $(LOCAL_PATH)/IBootControl.hal