From e4e6fdcfe2d33c8eb576d6b148fb61e38bf2cbd1 Mon Sep 17 00:00:00 2001 From: Naseer Ahmed Date: Fri, 2 Mar 2018 11:36:57 -0500 Subject: [PATCH] interfaces: Update hidl-gen for display config Change-Id: I12ad2e4511c0e8ca129dee5309bb56eb447b6034 --- display/Android.bp | 5 ++ display/config/1.0/Android.bp | 85 +++------------------------------ display/config/1.1/Android.bp | 88 +++-------------------------------- 3 files changed, 19 insertions(+), 159 deletions(-) diff --git a/display/Android.bp b/display/Android.bp index 3f22360..498c8a2 100644 --- a/display/Android.bp +++ b/display/Android.bp @@ -3,6 +3,11 @@ hidl_package_root { path: "vendor/qcom/opensource/interfaces/display", } +hidl_package_root { + name: "vendor.display", + path: "vendor/qcom/opensource/interfaces/display", +} + subdirs = [ "*", ] diff --git a/display/config/1.0/Android.bp b/display/config/1.0/Android.bp index a74bb0d..1f713b8 100644 --- a/display/config/1.0/Android.bp +++ b/display/config/1.0/Android.bp @@ -1,86 +1,15 @@ -// This file is autogenerated by hidl-gen. Do not edit manually. +// This file is autogenerated by hidl-gen -Landroidbp. -filegroup { - name: "vendor.display.config@1.0_hal", +hidl_interface { + name: "vendor.display.config@1.0", + owner: "qti", + root: "vendor.display", srcs: [ "IDisplayConfig.hal", ], -} - -genrule { - name: "vendor.display.config@1.0_genc++", - tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Lc++-sources -randroid.hidl:system/libhidl/transport -rvendor:vendor/qcom/opensource/interfaces/ vendor.display.config@1.0", - srcs: [ - ":vendor.display.config@1.0_hal", - ], - out: [ - "vendor/display/config/1.0/DisplayConfigAll.cpp", - ], -} - -genrule { - name: "vendor.display.config@1.0_genc++_headers", - tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Lc++-headers -randroid.hidl:system/libhidl/transport -rvendor:vendor/qcom/opensource/interfaces/ vendor.display.config@1.0", - srcs: [ - ":vendor.display.config@1.0_hal", - ], - out: [ - "vendor/display/config/1.0/IDisplayConfig.h", - "vendor/display/config/1.0/IHwDisplayConfig.h", - "vendor/display/config/1.0/BnHwDisplayConfig.h", - "vendor/display/config/1.0/BpHwDisplayConfig.h", - "vendor/display/config/1.0/BsDisplayConfig.h", - ], -} - -cc_library_shared { - name: "vendor.display.config@1.0", - defaults: ["hidl-module-defaults"], - generated_sources: ["vendor.display.config@1.0_genc++"], - generated_headers: ["vendor.display.config@1.0_genc++_headers"], - export_generated_headers: ["vendor.display.config@1.0_genc++_headers"], - vendor_available: true, - shared_libs: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "liblog", - "libutils", - "libcutils", - "android.hidl.base@1.0", - ], - export_shared_lib_headers: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "libutils", + interfaces: [ "android.hidl.base@1.0", ], + gen_java: true, } -cc_library_shared { - name: "vendor.display.config@1.0_vendor", - defaults: ["hidl-module-defaults"], - generated_sources: ["vendor.display.config@1.0_genc++"], - generated_headers: ["vendor.display.config@1.0_genc++_headers"], - export_generated_headers: ["vendor.display.config@1.0_genc++_headers"], - vendor: true, - shared_libs: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "liblog", - "libutils", - "libcutils", - "android.hidl.base@1.0", - ], - export_shared_lib_headers: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "libutils", - "android.hidl.base@1.0", - ], -} diff --git a/display/config/1.1/Android.bp b/display/config/1.1/Android.bp index d0ba1d4..584ce71 100644 --- a/display/config/1.1/Android.bp +++ b/display/config/1.1/Android.bp @@ -1,90 +1,16 @@ -// This file is autogenerated by hidl-gen. Do not edit manually. +// This file is autogenerated by hidl-gen -Landroidbp. -filegroup { - name: "vendor.display.config@1.1_hal", +hidl_interface { + name: "vendor.display.config@1.1", + owner: "qti", + root: "vendor.display", srcs: [ "IDisplayConfig.hal", ], -} - -genrule { - name: "vendor.display.config@1.1_genc++", - tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Lc++-sources -randroid.hidl:system/libhidl/transport -rvendor:vendor/qcom/opensource/interfaces vendor.display.config@1.1", - srcs: [ - ":vendor.display.config@1.1_hal", - ], - out: [ - "vendor/display/config/1.1/DisplayConfigAll.cpp", - ], -} - -genrule { - name: "vendor.display.config@1.1_genc++_headers", - tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Lc++-headers -randroid.hidl:system/libhidl/transport -rvendor:vendor/qcom/opensource/interfaces vendor.display.config@1.1", - srcs: [ - ":vendor.display.config@1.1_hal", - ], - out: [ - "vendor/display/config/1.1/IDisplayConfig.h", - "vendor/display/config/1.1/IHwDisplayConfig.h", - "vendor/display/config/1.1/BnHwDisplayConfig.h", - "vendor/display/config/1.1/BpHwDisplayConfig.h", - "vendor/display/config/1.1/BsDisplayConfig.h", - ], -} - -cc_library_shared { - name: "vendor.display.config@1.1", - defaults: ["hidl-module-defaults"], - generated_sources: ["vendor.display.config@1.1_genc++"], - generated_headers: ["vendor.display.config@1.1_genc++_headers"], - export_generated_headers: ["vendor.display.config@1.1_genc++_headers"], - vendor_available: true, - shared_libs: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "liblog", - "libutils", - "libcutils", - "android.hidl.base@1.0", - "vendor.display.config@1.0", - ], - export_shared_lib_headers: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "libutils", + interfaces: [ "android.hidl.base@1.0", "vendor.display.config@1.0", ], + gen_java: true, } -cc_library_shared { - name: "vendor.display.config@1.1_vendor", - defaults: ["hidl-module-defaults"], - generated_sources: ["vendor.display.config@1.1_genc++"], - generated_headers: ["vendor.display.config@1.1_genc++_headers"], - export_generated_headers: ["vendor.display.config@1.1_genc++_headers"], - vendor: true, - shared_libs: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "liblog", - "libutils", - "libcutils", - "android.hidl.base@1.0", - "vendor.display.config@1.0_vendor", - ], - export_shared_lib_headers: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "libutils", - "android.hidl.base@1.0", - "vendor.display.config@1.0_vendor", - ], -}