Generate blueprint with updated hidl-gen
- Updated Android.bp with latest hidl-gen for all HAL modules - Add package root for HAL modules. Change-Id: I2c5bd4b275eb0f29d330383afc49417230eacc8b
This commit is contained in:
19
Android.bp
19
Android.bp
@@ -1,3 +1,22 @@
|
||||
subdirs = [
|
||||
"*"
|
||||
]
|
||||
hidl_package_root {
|
||||
name: "vendor.qti.hardware.camera",
|
||||
path: "vendor/qcom/opensource/interfaces/camera",
|
||||
}
|
||||
|
||||
hidl_package_root {
|
||||
name: "vendor.qti.hardware.display",
|
||||
path: "vendor/qcom/opensource/interfaces/display",
|
||||
}
|
||||
|
||||
hidl_package_root {
|
||||
name: "vendor.qti.hardware.wifi",
|
||||
path: "vendor/qcom/opensource/interfaces/wifi",
|
||||
}
|
||||
|
||||
hidl_package_root {
|
||||
name: "vendor.display",
|
||||
path: "vendor/qcom/opensource/interfaces/display",
|
||||
}
|
||||
|
||||
@@ -1,3 +0,0 @@
|
||||
subdirs = [
|
||||
"device/1.0",
|
||||
]
|
||||
@@ -1,94 +1,20 @@
|
||||
// This file is autogenerated by hidl-gen. Do not edit manually.
|
||||
// This file is autogenerated by hidl-gen -Landroidbp.
|
||||
|
||||
filegroup {
|
||||
name: "vendor.qti.hardware.camera.device@1.0_hal",
|
||||
hidl_interface {
|
||||
name: "vendor.qti.hardware.camera.device@1.0",
|
||||
root: "vendor.qti.hardware.camera",
|
||||
srcs: [
|
||||
"types.hal",
|
||||
"IQCameraDeviceCallback.hal",
|
||||
],
|
||||
}
|
||||
|
||||
genrule {
|
||||
name: "vendor.qti.hardware.camera.device@1.0_genc++",
|
||||
tools: ["hidl-gen"],
|
||||
cmd: "$(location hidl-gen) -o $(genDir) -Lc++-sources -randroid.hardware:hardware/interfaces/ -randroid.hidl:system/libhidl/transport/ -rvendor.qti.hardware:vendor/qcom/opensource/interfaces/ vendor.qti.hardware.camera.device@1.0",
|
||||
srcs: [
|
||||
":vendor.qti.hardware.camera.device@1.0_hal",
|
||||
],
|
||||
out: [
|
||||
"vendor/qti/hardware/camera/device/1.0/types.cpp",
|
||||
"vendor/qti/hardware/camera/device/1.0/QCameraDeviceCallbackAll.cpp",
|
||||
],
|
||||
}
|
||||
|
||||
genrule {
|
||||
name: "vendor.qti.hardware.camera.device@1.0_genc++_headers",
|
||||
tools: ["hidl-gen"],
|
||||
cmd: "$(location hidl-gen) -o $(genDir) -Lc++-headers -randroid.hardware:hardware/interfaces/ -randroid.hidl:system/libhidl/transport/ -rvendor.qti.hardware:vendor/qcom/opensource/interfaces/ vendor.qti.hardware.camera.device@1.0",
|
||||
srcs: [
|
||||
":vendor.qti.hardware.camera.device@1.0_hal",
|
||||
],
|
||||
out: [
|
||||
"vendor/qti/hardware/camera/device/1.0/types.h",
|
||||
"vendor/qti/hardware/camera/device/1.0/hwtypes.h",
|
||||
"vendor/qti/hardware/camera/device/1.0/IQCameraDeviceCallback.h",
|
||||
"vendor/qti/hardware/camera/device/1.0/IHwQCameraDeviceCallback.h",
|
||||
"vendor/qti/hardware/camera/device/1.0/BnHwQCameraDeviceCallback.h",
|
||||
"vendor/qti/hardware/camera/device/1.0/BpHwQCameraDeviceCallback.h",
|
||||
"vendor/qti/hardware/camera/device/1.0/BsQCameraDeviceCallback.h",
|
||||
],
|
||||
}
|
||||
|
||||
cc_library_shared {
|
||||
name: "vendor.qti.hardware.camera.device@1.0",
|
||||
defaults: ["hidl-module-defaults"],
|
||||
generated_sources: ["vendor.qti.hardware.camera.device@1.0_genc++"],
|
||||
generated_headers: ["vendor.qti.hardware.camera.device@1.0_genc++_headers"],
|
||||
export_generated_headers: ["vendor.qti.hardware.camera.device@1.0_genc++_headers"],
|
||||
vendor_available: true,
|
||||
shared_libs: [
|
||||
"libhidlbase",
|
||||
"libhidltransport",
|
||||
"libhwbinder",
|
||||
"liblog",
|
||||
"libutils",
|
||||
"libcutils",
|
||||
interfaces: [
|
||||
"android.hardware.camera.device@1.0",
|
||||
"android.hidl.base@1.0",
|
||||
],
|
||||
export_shared_lib_headers: [
|
||||
"libhidlbase",
|
||||
"libhidltransport",
|
||||
"libhwbinder",
|
||||
"libutils",
|
||||
"android.hardware.camera.device@1.0",
|
||||
"android.hidl.base@1.0",
|
||||
types: [
|
||||
"CameraFace",
|
||||
"QCameraFrameMetadata",
|
||||
],
|
||||
gen_java: false,
|
||||
}
|
||||
|
||||
cc_library_shared {
|
||||
name: "vendor.qti.hardware.camera.device@1.0_vendor",
|
||||
defaults: ["hidl-module-defaults"],
|
||||
generated_sources: ["vendor.qti.hardware.camera.device@1.0_genc++"],
|
||||
generated_headers: ["vendor.qti.hardware.camera.device@1.0_genc++_headers"],
|
||||
export_generated_headers: ["vendor.qti.hardware.camera.device@1.0_genc++_headers"],
|
||||
vendor: true,
|
||||
shared_libs: [
|
||||
"libhidlbase",
|
||||
"libhidltransport",
|
||||
"libhwbinder",
|
||||
"liblog",
|
||||
"libutils",
|
||||
"libcutils",
|
||||
"android.hardware.camera.device@1.0",
|
||||
"android.hidl.base@1.0",
|
||||
],
|
||||
export_shared_lib_headers: [
|
||||
"libhidlbase",
|
||||
"libhidltransport",
|
||||
"libhwbinder",
|
||||
"libutils",
|
||||
"android.hardware.camera.device@1.0",
|
||||
"android.hidl.base@1.0",
|
||||
],
|
||||
}
|
||||
|
||||
@@ -1,4 +0,0 @@
|
||||
subdirs = [
|
||||
"1.0",
|
||||
]
|
||||
|
||||
@@ -1,13 +0,0 @@
|
||||
hidl_package_root {
|
||||
name: "vendor.qti.hardware.display",
|
||||
path: "vendor/qcom/opensource/interfaces/display",
|
||||
}
|
||||
|
||||
hidl_package_root {
|
||||
name: "vendor.display",
|
||||
path: "vendor/qcom/opensource/interfaces/display",
|
||||
}
|
||||
|
||||
subdirs = [
|
||||
"*",
|
||||
]
|
||||
@@ -11,6 +11,7 @@ hidl_interface {
|
||||
"android.hardware.graphics.common@1.0",
|
||||
"android.hardware.graphics.mapper@2.0",
|
||||
"android.hidl.base@1.0",
|
||||
"vendor.qti.hardware.display.mapper@1.0",
|
||||
],
|
||||
gen_java: false,
|
||||
}
|
||||
|
||||
@@ -1,3 +0,0 @@
|
||||
subdirs = [
|
||||
"1.0",
|
||||
]
|
||||
@@ -2,7 +2,6 @@
|
||||
|
||||
hidl_interface {
|
||||
name: "vendor.qti.hardware.display.composer@1.0",
|
||||
owner: "qti",
|
||||
root: "vendor.qti.hardware.display",
|
||||
srcs: [
|
||||
"IQtiComposer.hal",
|
||||
|
||||
@@ -1,3 +0,0 @@
|
||||
subdirs = [
|
||||
"1.0",
|
||||
]
|
||||
@@ -2,7 +2,6 @@
|
||||
|
||||
hidl_interface {
|
||||
name: "vendor.display.config@1.0",
|
||||
owner: "qti",
|
||||
root: "vendor.display",
|
||||
srcs: [
|
||||
"IDisplayConfig.hal",
|
||||
|
||||
@@ -2,7 +2,6 @@
|
||||
|
||||
hidl_interface {
|
||||
name: "vendor.display.config@1.1",
|
||||
owner: "qti",
|
||||
root: "vendor.display",
|
||||
srcs: [
|
||||
"IDisplayConfig.hal",
|
||||
|
||||
@@ -1,5 +0,0 @@
|
||||
// This is an autogenerated file, do not edit.
|
||||
subdirs = [
|
||||
"1.0",
|
||||
"1.1",
|
||||
]
|
||||
@@ -1,3 +0,0 @@
|
||||
subdirs = [
|
||||
"1.0",
|
||||
]
|
||||
@@ -1,3 +0,0 @@
|
||||
subdirs = [
|
||||
"*"
|
||||
]
|
||||
@@ -1,100 +1,17 @@
|
||||
// This file is autogenerated by hidl-gen. Do not edit manually.
|
||||
// This file is autogenerated by hidl-gen -Landroidbp.
|
||||
|
||||
filegroup {
|
||||
name: "vendor.qti.hardware.wifi.supplicant@1.0_hal",
|
||||
hidl_interface {
|
||||
name: "vendor.qti.hardware.wifi.supplicant@1.0",
|
||||
root: "vendor.qti.hardware.wifi",
|
||||
srcs: [
|
||||
"ISupplicantVendorStaIface.hal",
|
||||
"ISupplicantVendorStaIfaceCallback.hal",
|
||||
"ISupplicantVendorStaNetwork.hal",
|
||||
],
|
||||
interfaces: [
|
||||
"android.hardware.wifi.supplicant@1.0",
|
||||
"android.hidl.base@1.0",
|
||||
],
|
||||
gen_java: true,
|
||||
}
|
||||
|
||||
genrule {
|
||||
name: "vendor.qti.hardware.wifi.supplicant@1.0_genc++",
|
||||
tools: ["hidl-gen"],
|
||||
cmd: "$(location hidl-gen) -o $(genDir) -Lc++-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport -rvendor.qti.hardware:vendor/qcom/opensource/interfaces vendor.qti.hardware.wifi.supplicant@1.0",
|
||||
srcs: [
|
||||
":vendor.qti.hardware.wifi.supplicant@1.0_hal",
|
||||
],
|
||||
out: [
|
||||
"vendor/qti/hardware/wifi/supplicant/1.0/SupplicantVendorStaIfaceAll.cpp",
|
||||
"vendor/qti/hardware/wifi/supplicant/1.0/SupplicantVendorStaIfaceCallbackAll.cpp",
|
||||
"vendor/qti/hardware/wifi/supplicant/1.0/SupplicantVendorStaNetworkAll.cpp",
|
||||
],
|
||||
}
|
||||
|
||||
genrule {
|
||||
name: "vendor.qti.hardware.wifi.supplicant@1.0_genc++_headers",
|
||||
tools: ["hidl-gen"],
|
||||
cmd: "$(location hidl-gen) -o $(genDir) -Lc++-headers -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport -rvendor.qti.hardware:vendor/qcom/opensource/interfaces vendor.qti.hardware.wifi.supplicant@1.0",
|
||||
srcs: [
|
||||
":vendor.qti.hardware.wifi.supplicant@1.0_hal",
|
||||
],
|
||||
out: [
|
||||
"vendor/qti/hardware/wifi/supplicant/1.0/ISupplicantVendorStaIface.h",
|
||||
"vendor/qti/hardware/wifi/supplicant/1.0/IHwSupplicantVendorStaIface.h",
|
||||
"vendor/qti/hardware/wifi/supplicant/1.0/BnHwSupplicantVendorStaIface.h",
|
||||
"vendor/qti/hardware/wifi/supplicant/1.0/BpHwSupplicantVendorStaIface.h",
|
||||
"vendor/qti/hardware/wifi/supplicant/1.0/BsSupplicantVendorStaIface.h",
|
||||
"vendor/qti/hardware/wifi/supplicant/1.0/ISupplicantVendorStaIfaceCallback.h",
|
||||
"vendor/qti/hardware/wifi/supplicant/1.0/IHwSupplicantVendorStaIfaceCallback.h",
|
||||
"vendor/qti/hardware/wifi/supplicant/1.0/BnHwSupplicantVendorStaIfaceCallback.h",
|
||||
"vendor/qti/hardware/wifi/supplicant/1.0/BpHwSupplicantVendorStaIfaceCallback.h",
|
||||
"vendor/qti/hardware/wifi/supplicant/1.0/BsSupplicantVendorStaIfaceCallback.h",
|
||||
"vendor/qti/hardware/wifi/supplicant/1.0/ISupplicantVendorStaNetwork.h",
|
||||
"vendor/qti/hardware/wifi/supplicant/1.0/IHwSupplicantVendorStaNetwork.h",
|
||||
"vendor/qti/hardware/wifi/supplicant/1.0/BnHwSupplicantVendorStaNetwork.h",
|
||||
"vendor/qti/hardware/wifi/supplicant/1.0/BpHwSupplicantVendorStaNetwork.h",
|
||||
"vendor/qti/hardware/wifi/supplicant/1.0/BsSupplicantVendorStaNetwork.h",
|
||||
],
|
||||
}
|
||||
|
||||
cc_library_shared {
|
||||
name: "vendor.qti.hardware.wifi.supplicant@1.0",
|
||||
defaults: ["hidl-module-defaults"],
|
||||
generated_sources: ["vendor.qti.hardware.wifi.supplicant@1.0_genc++"],
|
||||
generated_headers: ["vendor.qti.hardware.wifi.supplicant@1.0_genc++_headers"],
|
||||
export_generated_headers: ["vendor.qti.hardware.wifi.supplicant@1.0_genc++_headers"],
|
||||
vendor_available: true,
|
||||
shared_libs: [
|
||||
"libhidlbase",
|
||||
"libhidltransport",
|
||||
"libhwbinder",
|
||||
"liblog",
|
||||
"libutils",
|
||||
"libcutils",
|
||||
"android.hardware.wifi.supplicant@1.0",
|
||||
],
|
||||
export_shared_lib_headers: [
|
||||
"libhidlbase",
|
||||
"libhidltransport",
|
||||
"libhwbinder",
|
||||
"libutils",
|
||||
"android.hardware.wifi.supplicant@1.0",
|
||||
],
|
||||
}
|
||||
|
||||
cc_library_shared {
|
||||
name: "vendor.qti.hardware.wifi.supplicant@1.0_vendor",
|
||||
defaults: ["hidl-module-defaults"],
|
||||
generated_sources: ["vendor.qti.hardware.wifi.supplicant@1.0_genc++"],
|
||||
generated_headers: ["vendor.qti.hardware.wifi.supplicant@1.0_genc++_headers"],
|
||||
export_generated_headers: ["vendor.qti.hardware.wifi.supplicant@1.0_genc++_headers"],
|
||||
vendor: true,
|
||||
shared_libs: [
|
||||
"libhidlbase",
|
||||
"libhidltransport",
|
||||
"libhwbinder",
|
||||
"liblog",
|
||||
"libutils",
|
||||
"libcutils",
|
||||
"android.hardware.wifi.supplicant@1.0",
|
||||
],
|
||||
export_shared_lib_headers: [
|
||||
"libhidlbase",
|
||||
"libhidltransport",
|
||||
"libhwbinder",
|
||||
"libutils",
|
||||
"android.hardware.wifi.supplicant@1.0",
|
||||
],
|
||||
}
|
||||
|
||||
@@ -1,4 +0,0 @@
|
||||
subdirs = [
|
||||
"1.0"
|
||||
]
|
||||
|
||||
Reference in New Issue
Block a user