From 31cf3c96021d55a1e76b684c8d8967c742c17871 Mon Sep 17 00:00:00 2001 From: Vinay Verma Date: Mon, 9 Apr 2018 17:45:12 +0530 Subject: [PATCH] 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 --- Android.bp | 19 ++++++ camera/Android.bp | 3 - camera/device/1.0/Android.bp | 92 +++------------------------- camera/device/Android.bp | 4 -- display/Android.bp | 13 ---- display/allocator/1.0/Android.bp | 1 + display/allocator/Android.bp | 3 - display/composer/1.0/Android.bp | 1 - display/composer/Android.bp | 3 - display/config/1.0/Android.bp | 1 - display/config/1.1/Android.bp | 1 - display/config/Android.bp | 5 -- display/mapper/Android.bp | 3 - wifi/Android.bp | 3 - wifi/supplicant/1.0/Android.bp | 101 +++---------------------------- wifi/supplicant/Android.bp | 4 -- 16 files changed, 38 insertions(+), 219 deletions(-) delete mode 100644 camera/Android.bp delete mode 100644 camera/device/Android.bp delete mode 100644 display/Android.bp delete mode 100644 display/allocator/Android.bp delete mode 100644 display/composer/Android.bp delete mode 100644 display/config/Android.bp delete mode 100644 display/mapper/Android.bp delete mode 100644 wifi/Android.bp delete mode 100644 wifi/supplicant/Android.bp diff --git a/Android.bp b/Android.bp index 7aef46b..4dfd4c8 100644 --- a/Android.bp +++ b/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", +} diff --git a/camera/Android.bp b/camera/Android.bp deleted file mode 100644 index dd86b40..0000000 --- a/camera/Android.bp +++ /dev/null @@ -1,3 +0,0 @@ -subdirs = [ - "device/1.0", -] diff --git a/camera/device/1.0/Android.bp b/camera/device/1.0/Android.bp index 087cf7c..f44f420 100644 --- a/camera/device/1.0/Android.bp +++ b/camera/device/1.0/Android.bp @@ -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", - ], -} diff --git a/camera/device/Android.bp b/camera/device/Android.bp deleted file mode 100644 index a670087..0000000 --- a/camera/device/Android.bp +++ /dev/null @@ -1,4 +0,0 @@ -subdirs = [ - "1.0", -] - diff --git a/display/Android.bp b/display/Android.bp deleted file mode 100644 index 498c8a2..0000000 --- a/display/Android.bp +++ /dev/null @@ -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 = [ - "*", -] diff --git a/display/allocator/1.0/Android.bp b/display/allocator/1.0/Android.bp index 2973a06..d3a3b1e 100644 --- a/display/allocator/1.0/Android.bp +++ b/display/allocator/1.0/Android.bp @@ -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, } diff --git a/display/allocator/Android.bp b/display/allocator/Android.bp deleted file mode 100644 index 58a4473..0000000 --- a/display/allocator/Android.bp +++ /dev/null @@ -1,3 +0,0 @@ -subdirs = [ - "1.0", -] diff --git a/display/composer/1.0/Android.bp b/display/composer/1.0/Android.bp index a2a2c0d..bdbe128 100644 --- a/display/composer/1.0/Android.bp +++ b/display/composer/1.0/Android.bp @@ -2,7 +2,6 @@ hidl_interface { name: "vendor.qti.hardware.display.composer@1.0", - owner: "qti", root: "vendor.qti.hardware.display", srcs: [ "IQtiComposer.hal", diff --git a/display/composer/Android.bp b/display/composer/Android.bp deleted file mode 100644 index 58a4473..0000000 --- a/display/composer/Android.bp +++ /dev/null @@ -1,3 +0,0 @@ -subdirs = [ - "1.0", -] diff --git a/display/config/1.0/Android.bp b/display/config/1.0/Android.bp index 1f713b8..e51647e 100644 --- a/display/config/1.0/Android.bp +++ b/display/config/1.0/Android.bp @@ -2,7 +2,6 @@ hidl_interface { name: "vendor.display.config@1.0", - owner: "qti", root: "vendor.display", srcs: [ "IDisplayConfig.hal", diff --git a/display/config/1.1/Android.bp b/display/config/1.1/Android.bp index 584ce71..3c4a869 100644 --- a/display/config/1.1/Android.bp +++ b/display/config/1.1/Android.bp @@ -2,7 +2,6 @@ hidl_interface { name: "vendor.display.config@1.1", - owner: "qti", root: "vendor.display", srcs: [ "IDisplayConfig.hal", diff --git a/display/config/Android.bp b/display/config/Android.bp deleted file mode 100644 index 8926b48..0000000 --- a/display/config/Android.bp +++ /dev/null @@ -1,5 +0,0 @@ -// This is an autogenerated file, do not edit. -subdirs = [ - "1.0", - "1.1", -] diff --git a/display/mapper/Android.bp b/display/mapper/Android.bp deleted file mode 100644 index 58a4473..0000000 --- a/display/mapper/Android.bp +++ /dev/null @@ -1,3 +0,0 @@ -subdirs = [ - "1.0", -] diff --git a/wifi/Android.bp b/wifi/Android.bp deleted file mode 100644 index 7aef46b..0000000 --- a/wifi/Android.bp +++ /dev/null @@ -1,3 +0,0 @@ -subdirs = [ - "*" -] diff --git a/wifi/supplicant/1.0/Android.bp b/wifi/supplicant/1.0/Android.bp index e2af8e8..ff392f9 100644 --- a/wifi/supplicant/1.0/Android.bp +++ b/wifi/supplicant/1.0/Android.bp @@ -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", - ], -} diff --git a/wifi/supplicant/Android.bp b/wifi/supplicant/Android.bp deleted file mode 100644 index e5682f5..0000000 --- a/wifi/supplicant/Android.bp +++ /dev/null @@ -1,4 +0,0 @@ -subdirs = [ - "1.0" -] -