From a1169dd600091cc9a451b91e7b4573dc1d9049b3 Mon Sep 17 00:00:00 2001 From: Steven Moreland Date: Thu, 9 Nov 2017 19:05:17 -0800 Subject: Update makefiles for hidl_interface. Bug: 35570956 Test: manual Change-Id: I7a220b78ee081240e1dc30ef5672ba39e3e98375 --- graphics/allocator/2.0/Android.bp | 148 ++----------------------------- graphics/bufferqueue/1.0/Android.bp | 156 ++------------------------------- graphics/common/1.0/Android.bp | 111 +++--------------------- graphics/composer/2.1/Android.bp | 168 +++--------------------------------- graphics/mapper/2.0/Android.bp | 149 +++----------------------------- 5 files changed, 52 insertions(+), 680 deletions(-) (limited to 'graphics') diff --git a/graphics/allocator/2.0/Android.bp b/graphics/allocator/2.0/Android.bp index e98f90af35..0b0722e249 100644 --- a/graphics/allocator/2.0/Android.bp +++ b/graphics/allocator/2.0/Android.bp @@ -1,154 +1,20 @@ -// This file is autogenerated by hidl-gen. Do not edit manually. +// This file is autogenerated by hidl-gen -Landroidbp. -filegroup { - name: "android.hardware.graphics.allocator@2.0_hal", - srcs: [ - "IAllocator.hal", - ], -} - -genrule { - name: "android.hardware.graphics.allocator@2.0_genc++", - tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Lc++-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.graphics.allocator@2.0", - srcs: [ - ":android.hardware.graphics.allocator@2.0_hal", - ], - out: [ - "android/hardware/graphics/allocator/2.0/AllocatorAll.cpp", - ], -} - -genrule { - name: "android.hardware.graphics.allocator@2.0_genc++_headers", - tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Lc++-headers -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.graphics.allocator@2.0", - srcs: [ - ":android.hardware.graphics.allocator@2.0_hal", - ], - out: [ - "android/hardware/graphics/allocator/2.0/IAllocator.h", - "android/hardware/graphics/allocator/2.0/IHwAllocator.h", - "android/hardware/graphics/allocator/2.0/BnHwAllocator.h", - "android/hardware/graphics/allocator/2.0/BpHwAllocator.h", - "android/hardware/graphics/allocator/2.0/BsAllocator.h", - ], -} - -cc_library { +hidl_interface { name: "android.hardware.graphics.allocator@2.0", - defaults: ["hidl-module-defaults"], - generated_sources: ["android.hardware.graphics.allocator@2.0_genc++"], - generated_headers: ["android.hardware.graphics.allocator@2.0_genc++_headers"], - export_generated_headers: ["android.hardware.graphics.allocator@2.0_genc++_headers"], - vendor_available: true, + root: "android.hardware", vndk: { enabled: true, support_system_process: true, }, - shared_libs: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "liblog", - "libutils", - "libcutils", - "android.hardware.graphics.common@1.0", - "android.hardware.graphics.mapper@2.0", - ], - export_shared_lib_headers: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "libutils", - "android.hardware.graphics.common@1.0", - "android.hardware.graphics.mapper@2.0", - ], -} - -// This package is not java compatible. Not creating java target. - -// This package does not export any types. Not creating java constants export. - - -genrule { - name: "android.hardware.graphics.allocator@2.0-adapter-helper_genc++", - tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Lc++-adapter-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.graphics.allocator@2.0", srcs: [ - ":android.hardware.graphics.allocator@2.0_hal", - ], - out: [ - "android/hardware/graphics/allocator/2.0/AAllocator.cpp", - ], -} - -genrule { - name: "android.hardware.graphics.allocator@2.0-adapter-helper_genc++_headers", - tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Lc++-adapter-headers -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.graphics.allocator@2.0", - srcs: [ - ":android.hardware.graphics.allocator@2.0_hal", - ], - out: [ - "android/hardware/graphics/allocator/2.0/AAllocator.h", - ], -} - -cc_library { - name: "android.hardware.graphics.allocator@2.0-adapter-helper", - defaults: ["hidl-module-defaults"], - generated_sources: ["android.hardware.graphics.allocator@2.0-adapter-helper_genc++"], - generated_headers: ["android.hardware.graphics.allocator@2.0-adapter-helper_genc++_headers"], - export_generated_headers: ["android.hardware.graphics.allocator@2.0-adapter-helper_genc++_headers"], - vendor_available: true, - shared_libs: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "liblog", - "libutils", - "libcutils", - "libhidladapter", - "android.hardware.graphics.allocator@2.0", - "android.hardware.graphics.common@1.0", - "android.hardware.graphics.mapper@2.0", - "android.hardware.graphics.mapper@2.0-adapter-helper", - "android.hidl.base@1.0-adapter-helper", + "IAllocator.hal", ], - export_shared_lib_headers: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "libutils", - "libhidladapter", - "android.hardware.graphics.allocator@2.0", + interfaces: [ "android.hardware.graphics.common@1.0", "android.hardware.graphics.mapper@2.0", - "android.hardware.graphics.mapper@2.0-adapter-helper", - "android.hidl.base@1.0-adapter-helper", + "android.hidl.base@1.0", ], + gen_java: false, } -genrule { - name: "android.hardware.graphics.allocator@2.0-adapter_genc++", - tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Lc++-adapter-main -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.graphics.allocator@2.0", - out: ["main.cpp"] -} - -cc_test { - name: "android.hardware.graphics.allocator@2.0-adapter", - defaults: ["hidl-module-defaults"], - shared_libs: [ - "libhidladapter", - "libhidlbase", - "libhidltransport", - "libutils", - "android.hardware.graphics.allocator@2.0", - "android.hardware.graphics.common@1.0", - "android.hardware.graphics.mapper@2.0", - "android.hardware.graphics.allocator@2.0-adapter-helper", - ], - generated_sources: ["android.hardware.graphics.allocator@2.0-adapter_genc++"], -} diff --git a/graphics/bufferqueue/1.0/Android.bp b/graphics/bufferqueue/1.0/Android.bp index 5e930b9fcc..0333a4296d 100644 --- a/graphics/bufferqueue/1.0/Android.bp +++ b/graphics/bufferqueue/1.0/Android.bp @@ -1,160 +1,20 @@ -// This file is autogenerated by hidl-gen. Do not edit manually. +// This file is autogenerated by hidl-gen -Landroidbp. -filegroup { - name: "android.hardware.graphics.bufferqueue@1.0_hal", - srcs: [ - "IGraphicBufferProducer.hal", - "IProducerListener.hal", - ], -} - -genrule { - name: "android.hardware.graphics.bufferqueue@1.0_genc++", - tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Lc++-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.graphics.bufferqueue@1.0", - srcs: [ - ":android.hardware.graphics.bufferqueue@1.0_hal", - ], - out: [ - "android/hardware/graphics/bufferqueue/1.0/GraphicBufferProducerAll.cpp", - "android/hardware/graphics/bufferqueue/1.0/ProducerListenerAll.cpp", - ], -} - -genrule { - name: "android.hardware.graphics.bufferqueue@1.0_genc++_headers", - tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Lc++-headers -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.graphics.bufferqueue@1.0", - srcs: [ - ":android.hardware.graphics.bufferqueue@1.0_hal", - ], - out: [ - "android/hardware/graphics/bufferqueue/1.0/IGraphicBufferProducer.h", - "android/hardware/graphics/bufferqueue/1.0/IHwGraphicBufferProducer.h", - "android/hardware/graphics/bufferqueue/1.0/BnHwGraphicBufferProducer.h", - "android/hardware/graphics/bufferqueue/1.0/BpHwGraphicBufferProducer.h", - "android/hardware/graphics/bufferqueue/1.0/BsGraphicBufferProducer.h", - "android/hardware/graphics/bufferqueue/1.0/IProducerListener.h", - "android/hardware/graphics/bufferqueue/1.0/IHwProducerListener.h", - "android/hardware/graphics/bufferqueue/1.0/BnHwProducerListener.h", - "android/hardware/graphics/bufferqueue/1.0/BpHwProducerListener.h", - "android/hardware/graphics/bufferqueue/1.0/BsProducerListener.h", - ], -} - -cc_library { +hidl_interface { name: "android.hardware.graphics.bufferqueue@1.0", - defaults: ["hidl-module-defaults"], - generated_sources: ["android.hardware.graphics.bufferqueue@1.0_genc++"], - generated_headers: ["android.hardware.graphics.bufferqueue@1.0_genc++_headers"], - export_generated_headers: ["android.hardware.graphics.bufferqueue@1.0_genc++_headers"], - vendor_available: true, + root: "android.hardware", vndk: { enabled: true, }, - shared_libs: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "liblog", - "libutils", - "libcutils", - "android.hardware.graphics.common@1.0", - "android.hardware.media@1.0", - ], - export_shared_lib_headers: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "libutils", - "android.hardware.graphics.common@1.0", - "android.hardware.media@1.0", - ], -} - -// This package is not java compatible. Not creating java target. - -// This package does not export any types. Not creating java constants export. - - -genrule { - name: "android.hardware.graphics.bufferqueue@1.0-adapter-helper_genc++", - tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Lc++-adapter-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.graphics.bufferqueue@1.0", - srcs: [ - ":android.hardware.graphics.bufferqueue@1.0_hal", - ], - out: [ - "android/hardware/graphics/bufferqueue/1.0/AGraphicBufferProducer.cpp", - "android/hardware/graphics/bufferqueue/1.0/AProducerListener.cpp", - ], -} - -genrule { - name: "android.hardware.graphics.bufferqueue@1.0-adapter-helper_genc++_headers", - tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Lc++-adapter-headers -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.graphics.bufferqueue@1.0", srcs: [ - ":android.hardware.graphics.bufferqueue@1.0_hal", - ], - out: [ - "android/hardware/graphics/bufferqueue/1.0/AGraphicBufferProducer.h", - "android/hardware/graphics/bufferqueue/1.0/AProducerListener.h", - ], -} - -cc_library { - name: "android.hardware.graphics.bufferqueue@1.0-adapter-helper", - defaults: ["hidl-module-defaults"], - generated_sources: ["android.hardware.graphics.bufferqueue@1.0-adapter-helper_genc++"], - generated_headers: ["android.hardware.graphics.bufferqueue@1.0-adapter-helper_genc++_headers"], - export_generated_headers: ["android.hardware.graphics.bufferqueue@1.0-adapter-helper_genc++_headers"], - vendor_available: true, - shared_libs: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "liblog", - "libutils", - "libcutils", - "libhidladapter", - "android.hardware.graphics.bufferqueue@1.0", - "android.hardware.graphics.common@1.0", - "android.hardware.media@1.0", - "android.hidl.base@1.0-adapter-helper", + "IGraphicBufferProducer.hal", + "IProducerListener.hal", ], - export_shared_lib_headers: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "libutils", - "libhidladapter", - "android.hardware.graphics.bufferqueue@1.0", + interfaces: [ "android.hardware.graphics.common@1.0", "android.hardware.media@1.0", - "android.hidl.base@1.0-adapter-helper", + "android.hidl.base@1.0", ], + gen_java: false, } -genrule { - name: "android.hardware.graphics.bufferqueue@1.0-adapter_genc++", - tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Lc++-adapter-main -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.graphics.bufferqueue@1.0", - out: ["main.cpp"] -} - -cc_test { - name: "android.hardware.graphics.bufferqueue@1.0-adapter", - defaults: ["hidl-module-defaults"], - shared_libs: [ - "libhidladapter", - "libhidlbase", - "libhidltransport", - "libutils", - "android.hardware.graphics.bufferqueue@1.0", - "android.hardware.graphics.common@1.0", - "android.hardware.media@1.0", - "android.hardware.graphics.bufferqueue@1.0-adapter-helper", - ], - generated_sources: ["android.hardware.graphics.bufferqueue@1.0-adapter_genc++"], -} diff --git a/graphics/common/1.0/Android.bp b/graphics/common/1.0/Android.bp index 4ea9c1a27d..f88cbdf083 100644 --- a/graphics/common/1.0/Android.bp +++ b/graphics/common/1.0/Android.bp @@ -1,108 +1,25 @@ -// This file is autogenerated by hidl-gen. Do not edit manually. +// This file is autogenerated by hidl-gen -Landroidbp. -filegroup { - name: "android.hardware.graphics.common@1.0_hal", - srcs: [ - "types.hal", - ], -} - -genrule { - name: "android.hardware.graphics.common@1.0_genc++", - tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Lc++-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.graphics.common@1.0", - srcs: [ - ":android.hardware.graphics.common@1.0_hal", - ], - out: [ - "android/hardware/graphics/common/1.0/types.cpp", - ], -} - -genrule { - name: "android.hardware.graphics.common@1.0_genc++_headers", - tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Lc++-headers -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.graphics.common@1.0", - srcs: [ - ":android.hardware.graphics.common@1.0_hal", - ], - out: [ - "android/hardware/graphics/common/1.0/types.h", - "android/hardware/graphics/common/1.0/hwtypes.h", - ], -} - -cc_library { +hidl_interface { name: "android.hardware.graphics.common@1.0", - defaults: ["hidl-module-defaults"], - generated_sources: ["android.hardware.graphics.common@1.0_genc++"], - generated_headers: ["android.hardware.graphics.common@1.0_genc++_headers"], - export_generated_headers: ["android.hardware.graphics.common@1.0_genc++_headers"], - vendor_available: true, + root: "android.hardware", vndk: { enabled: true, support_system_process: true, }, - shared_libs: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "liblog", - "libutils", - "libcutils", - ], - export_shared_lib_headers: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "libutils", - ], -} - -genrule { - name: "android.hardware.graphics.common-V1.0-java_gen_java", - tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Ljava -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.graphics.common@1.0", - srcs: [ - ":android.hardware.graphics.common@1.0_hal", - ], - out: [ - "android/hardware/graphics/common/V1_0/BufferUsage.java", - "android/hardware/graphics/common/V1_0/ColorMode.java", - "android/hardware/graphics/common/V1_0/ColorTransform.java", - "android/hardware/graphics/common/V1_0/Dataspace.java", - "android/hardware/graphics/common/V1_0/Hdr.java", - "android/hardware/graphics/common/V1_0/PixelFormat.java", - "android/hardware/graphics/common/V1_0/Transform.java", - ], -} - -java_library { - name: "android.hardware.graphics.common-V1.0-java", - no_framework_libs: true, - defaults: ["hidl-java-module-defaults"], - srcs: [":android.hardware.graphics.common-V1.0-java_gen_java"], - libs: [ - "hwbinder", - ] -} - -genrule { - name: "android.hardware.graphics.common-V1.0-java-constants_gen_java", - tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Ljava-constants -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.graphics.common@1.0", srcs: [ - ":android.hardware.graphics.common@1.0_hal", + "types.hal", ], - out: [ - "android/hardware/graphics/common/V1_0/Constants.java", + types: [ + "BufferUsage", + "ColorMode", + "ColorTransform", + "Dataspace", + "Hdr", + "PixelFormat", + "Transform", ], + gen_java: true, + gen_java_constants: true, } -java_library { - name: "android.hardware.graphics.common-V1.0-java-constants", - no_framework_libs: true, - defaults: ["hidl-java-module-defaults"], - srcs: [":android.hardware.graphics.common-V1.0-java-constants_gen_java"], -} -// This package has no interfaces. Not creating versioning adapter. diff --git a/graphics/composer/2.1/Android.bp b/graphics/composer/2.1/Android.bp index 41cc5a6b6d..8fbc8c293b 100644 --- a/graphics/composer/2.1/Android.bp +++ b/graphics/composer/2.1/Android.bp @@ -1,168 +1,24 @@ -// This file is autogenerated by hidl-gen. Do not edit manually. +// This file is autogenerated by hidl-gen -Landroidbp. -filegroup { - name: "android.hardware.graphics.composer@2.1_hal", - srcs: [ - "types.hal", - "IComposer.hal", - "IComposerCallback.hal", - "IComposerClient.hal", - ], -} - -genrule { - name: "android.hardware.graphics.composer@2.1_genc++", - tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Lc++-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.graphics.composer@2.1", - srcs: [ - ":android.hardware.graphics.composer@2.1_hal", - ], - out: [ - "android/hardware/graphics/composer/2.1/types.cpp", - "android/hardware/graphics/composer/2.1/ComposerAll.cpp", - "android/hardware/graphics/composer/2.1/ComposerCallbackAll.cpp", - "android/hardware/graphics/composer/2.1/ComposerClientAll.cpp", - ], -} - -genrule { - name: "android.hardware.graphics.composer@2.1_genc++_headers", - tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Lc++-headers -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.graphics.composer@2.1", - srcs: [ - ":android.hardware.graphics.composer@2.1_hal", - ], - out: [ - "android/hardware/graphics/composer/2.1/types.h", - "android/hardware/graphics/composer/2.1/hwtypes.h", - "android/hardware/graphics/composer/2.1/IComposer.h", - "android/hardware/graphics/composer/2.1/IHwComposer.h", - "android/hardware/graphics/composer/2.1/BnHwComposer.h", - "android/hardware/graphics/composer/2.1/BpHwComposer.h", - "android/hardware/graphics/composer/2.1/BsComposer.h", - "android/hardware/graphics/composer/2.1/IComposerCallback.h", - "android/hardware/graphics/composer/2.1/IHwComposerCallback.h", - "android/hardware/graphics/composer/2.1/BnHwComposerCallback.h", - "android/hardware/graphics/composer/2.1/BpHwComposerCallback.h", - "android/hardware/graphics/composer/2.1/BsComposerCallback.h", - "android/hardware/graphics/composer/2.1/IComposerClient.h", - "android/hardware/graphics/composer/2.1/IHwComposerClient.h", - "android/hardware/graphics/composer/2.1/BnHwComposerClient.h", - "android/hardware/graphics/composer/2.1/BpHwComposerClient.h", - "android/hardware/graphics/composer/2.1/BsComposerClient.h", - ], -} - -cc_library { +hidl_interface { name: "android.hardware.graphics.composer@2.1", - defaults: ["hidl-module-defaults"], - generated_sources: ["android.hardware.graphics.composer@2.1_genc++"], - generated_headers: ["android.hardware.graphics.composer@2.1_genc++_headers"], - export_generated_headers: ["android.hardware.graphics.composer@2.1_genc++_headers"], - vendor_available: true, + root: "android.hardware", vndk: { enabled: true, }, - shared_libs: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "liblog", - "libutils", - "libcutils", - "android.hardware.graphics.common@1.0", - ], - export_shared_lib_headers: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "libutils", - "android.hardware.graphics.common@1.0", - ], -} - -// This package is not java compatible. Not creating java target. - -// This package does not export any types. Not creating java constants export. - - -genrule { - name: "android.hardware.graphics.composer@2.1-adapter-helper_genc++", - tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Lc++-adapter-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.graphics.composer@2.1", srcs: [ - ":android.hardware.graphics.composer@2.1_hal", - ], - out: [ - "android/hardware/graphics/composer/2.1/AComposer.cpp", - "android/hardware/graphics/composer/2.1/AComposerCallback.cpp", - "android/hardware/graphics/composer/2.1/AComposerClient.cpp", - ], -} - -genrule { - name: "android.hardware.graphics.composer@2.1-adapter-helper_genc++_headers", - tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Lc++-adapter-headers -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.graphics.composer@2.1", - srcs: [ - ":android.hardware.graphics.composer@2.1_hal", - ], - out: [ - "android/hardware/graphics/composer/2.1/AComposer.h", - "android/hardware/graphics/composer/2.1/AComposerCallback.h", - "android/hardware/graphics/composer/2.1/AComposerClient.h", + "types.hal", + "IComposer.hal", + "IComposerCallback.hal", + "IComposerClient.hal", ], -} - -cc_library { - name: "android.hardware.graphics.composer@2.1-adapter-helper", - defaults: ["hidl-module-defaults"], - generated_sources: ["android.hardware.graphics.composer@2.1-adapter-helper_genc++"], - generated_headers: ["android.hardware.graphics.composer@2.1-adapter-helper_genc++_headers"], - export_generated_headers: ["android.hardware.graphics.composer@2.1-adapter-helper_genc++_headers"], - vendor_available: true, - shared_libs: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "liblog", - "libutils", - "libcutils", - "libhidladapter", + interfaces: [ "android.hardware.graphics.common@1.0", - "android.hardware.graphics.composer@2.1", - "android.hidl.base@1.0-adapter-helper", + "android.hidl.base@1.0", ], - export_shared_lib_headers: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "libutils", - "libhidladapter", - "android.hardware.graphics.common@1.0", - "android.hardware.graphics.composer@2.1", - "android.hidl.base@1.0-adapter-helper", + types: [ + "Error", ], + gen_java: false, } -genrule { - name: "android.hardware.graphics.composer@2.1-adapter_genc++", - tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Lc++-adapter-main -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.graphics.composer@2.1", - out: ["main.cpp"] -} - -cc_test { - name: "android.hardware.graphics.composer@2.1-adapter", - defaults: ["hidl-module-defaults"], - shared_libs: [ - "libhidladapter", - "libhidlbase", - "libhidltransport", - "libutils", - "android.hardware.graphics.common@1.0", - "android.hardware.graphics.composer@2.1", - "android.hardware.graphics.composer@2.1-adapter-helper", - ], - generated_sources: ["android.hardware.graphics.composer@2.1-adapter_genc++"], -} diff --git a/graphics/mapper/2.0/Android.bp b/graphics/mapper/2.0/Android.bp index 3b9f0d83e9..2f9a344590 100644 --- a/graphics/mapper/2.0/Android.bp +++ b/graphics/mapper/2.0/Android.bp @@ -1,151 +1,24 @@ -// This file is autogenerated by hidl-gen. Do not edit manually. +// This file is autogenerated by hidl-gen -Landroidbp. -filegroup { - name: "android.hardware.graphics.mapper@2.0_hal", - srcs: [ - "types.hal", - "IMapper.hal", - ], -} - -genrule { - name: "android.hardware.graphics.mapper@2.0_genc++", - tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Lc++-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.graphics.mapper@2.0", - srcs: [ - ":android.hardware.graphics.mapper@2.0_hal", - ], - out: [ - "android/hardware/graphics/mapper/2.0/types.cpp", - "android/hardware/graphics/mapper/2.0/MapperAll.cpp", - ], -} - -genrule { - name: "android.hardware.graphics.mapper@2.0_genc++_headers", - tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Lc++-headers -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.graphics.mapper@2.0", - srcs: [ - ":android.hardware.graphics.mapper@2.0_hal", - ], - out: [ - "android/hardware/graphics/mapper/2.0/types.h", - "android/hardware/graphics/mapper/2.0/hwtypes.h", - "android/hardware/graphics/mapper/2.0/IMapper.h", - "android/hardware/graphics/mapper/2.0/IHwMapper.h", - "android/hardware/graphics/mapper/2.0/BnHwMapper.h", - "android/hardware/graphics/mapper/2.0/BpHwMapper.h", - "android/hardware/graphics/mapper/2.0/BsMapper.h", - ], -} - -cc_library { +hidl_interface { name: "android.hardware.graphics.mapper@2.0", - defaults: ["hidl-module-defaults"], - generated_sources: ["android.hardware.graphics.mapper@2.0_genc++"], - generated_headers: ["android.hardware.graphics.mapper@2.0_genc++_headers"], - export_generated_headers: ["android.hardware.graphics.mapper@2.0_genc++_headers"], - vendor_available: true, + root: "android.hardware", vndk: { enabled: true, support_system_process: true, }, - shared_libs: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "liblog", - "libutils", - "libcutils", - "android.hardware.graphics.common@1.0", - ], - export_shared_lib_headers: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "libutils", - "android.hardware.graphics.common@1.0", - ], -} - -// This package is not java compatible. Not creating java target. - -// This package does not export any types. Not creating java constants export. - - -genrule { - name: "android.hardware.graphics.mapper@2.0-adapter-helper_genc++", - tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Lc++-adapter-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.graphics.mapper@2.0", - srcs: [ - ":android.hardware.graphics.mapper@2.0_hal", - ], - out: [ - "android/hardware/graphics/mapper/2.0/AMapper.cpp", - ], -} - -genrule { - name: "android.hardware.graphics.mapper@2.0-adapter-helper_genc++_headers", - tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Lc++-adapter-headers -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.graphics.mapper@2.0", srcs: [ - ":android.hardware.graphics.mapper@2.0_hal", - ], - out: [ - "android/hardware/graphics/mapper/2.0/AMapper.h", + "types.hal", + "IMapper.hal", ], -} - -cc_library { - name: "android.hardware.graphics.mapper@2.0-adapter-helper", - defaults: ["hidl-module-defaults"], - generated_sources: ["android.hardware.graphics.mapper@2.0-adapter-helper_genc++"], - generated_headers: ["android.hardware.graphics.mapper@2.0-adapter-helper_genc++_headers"], - export_generated_headers: ["android.hardware.graphics.mapper@2.0-adapter-helper_genc++_headers"], - vendor_available: true, - shared_libs: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "liblog", - "libutils", - "libcutils", - "libhidladapter", + interfaces: [ "android.hardware.graphics.common@1.0", - "android.hardware.graphics.mapper@2.0", - "android.hidl.base@1.0-adapter-helper", + "android.hidl.base@1.0", ], - export_shared_lib_headers: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "libutils", - "libhidladapter", - "android.hardware.graphics.common@1.0", - "android.hardware.graphics.mapper@2.0", - "android.hidl.base@1.0-adapter-helper", + types: [ + "Error", + "YCbCrLayout", ], + gen_java: false, } -genrule { - name: "android.hardware.graphics.mapper@2.0-adapter_genc++", - tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Lc++-adapter-main -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.graphics.mapper@2.0", - out: ["main.cpp"] -} - -cc_test { - name: "android.hardware.graphics.mapper@2.0-adapter", - defaults: ["hidl-module-defaults"], - shared_libs: [ - "libhidladapter", - "libhidlbase", - "libhidltransport", - "libutils", - "android.hardware.graphics.common@1.0", - "android.hardware.graphics.mapper@2.0", - "android.hardware.graphics.mapper@2.0-adapter-helper", - ], - generated_sources: ["android.hardware.graphics.mapper@2.0-adapter_genc++"], -} -- cgit v1.2.3