Add build rule of driver/profier for graphics allocator hal.
* Updated the corresponding .vts file to match the latest .hal file.
Test: make android.hardware.graphics.allocator.vts.driver@2.0
make android.hardware.graphics.allocator@2.0-IAllocator-vts.profiler
make android.hardware.graphics.allocator@2.0-IAllocatorClient-vts.profiler
Change-Id: Ibf0fdf976a01015cca9cea71a6f25fc513d22d94
diff --git a/graphics/allocator/2.0/Android.bp b/graphics/allocator/2.0/Android.bp
index 8ea4b97..c145bc2 100644
--- a/graphics/allocator/2.0/Android.bp
+++ b/graphics/allocator/2.0/Android.bp
@@ -64,3 +64,160 @@
"android.hidl.base@1.0",
],
}
+
+genrule {
+ name: "android.hardware.graphics.allocator.vts.driver@2.0_genc++",
+ tools: ["hidl-gen", "vtsc"],
+ cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.graphics.allocator@2.0 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/graphics/allocator/2.0/ $(genDir)/android/hardware/graphics/allocator/2.0/",
+ srcs: [
+ "types.hal",
+ "IAllocator.hal",
+ "IAllocatorClient.hal",
+ ],
+ out: [
+ "android/hardware/graphics/allocator/2.0/types.vts.cpp",
+ "android/hardware/graphics/allocator/2.0/Allocator.vts.cpp",
+ "android/hardware/graphics/allocator/2.0/AllocatorClient.vts.cpp",
+ ],
+}
+
+genrule {
+ name: "android.hardware.graphics.allocator.vts.driver@2.0_genc++_headers",
+ tools: ["hidl-gen", "vtsc"],
+ cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.graphics.allocator@2.0 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/graphics/allocator/2.0/ $(genDir)/android/hardware/graphics/allocator/2.0/",
+ srcs: [
+ "types.hal",
+ "IAllocator.hal",
+ "IAllocatorClient.hal",
+ ],
+ out: [
+ "android/hardware/graphics/allocator/2.0/types.vts.h",
+ "android/hardware/graphics/allocator/2.0/Allocator.vts.h",
+ "android/hardware/graphics/allocator/2.0/AllocatorClient.vts.h",
+ ],
+}
+
+cc_library_shared {
+ name: "android.hardware.graphics.allocator.vts.driver@2.0",
+ generated_sources: ["android.hardware.graphics.allocator.vts.driver@2.0_genc++"],
+ generated_headers: ["android.hardware.graphics.allocator.vts.driver@2.0_genc++_headers"],
+ export_generated_headers: ["android.hardware.graphics.allocator.vts.driver@2.0_genc++_headers"],
+ shared_libs: [
+ "libhidlbase",
+ "libhidltransport",
+ "libhwbinder",
+ "liblog",
+ "libutils",
+ "libcutils",
+ "libvts_common",
+ "libvts_datatype",
+ "libvts_measurement",
+ "libvts_multidevice_proto",
+ "libcamera_metadata",
+ "libprotobuf-cpp-full",
+ "android.hardware.graphics.common@1.0",
+ "android.hidl.base@1.0",
+ "android.hardware.graphics.allocator@2.0",
+ ],
+ export_shared_lib_headers: [
+ "libhidlbase",
+ "libhidltransport",
+ "libhwbinder",
+ "libutils",
+ "android.hardware.graphics.common@1.0",
+ "android.hidl.base@1.0",
+ ],
+}
+
+genrule {
+ name: "android.hardware.graphics.allocator@2.0-IAllocator-vts.profiler_genc++",
+ tools: ["hidl-gen", "vtsc"],
+ cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.graphics.allocator@2.0 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/graphics/allocator/2.0/ $(genDir)/android/hardware/graphics/allocator/2.0/",
+ srcs: [
+ "IAllocator.hal",
+ "types.hal",
+ ],
+ out: [
+ "android/hardware/graphics/allocator/2.0/Allocator.vts.cpp",
+ "android/hardware/graphics/allocator/2.0/types.vts.cpp",
+ ],
+}
+
+genrule {
+ name: "android.hardware.graphics.allocator@2.0-IAllocator-vts.profiler_genc++_headers",
+ tools: ["hidl-gen", "vtsc"],
+ cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.graphics.allocator@2.0 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/graphics/allocator/2.0/ $(genDir)/android/hardware/graphics/allocator/2.0/",
+ srcs: [
+ "IAllocator.hal",
+ "types.hal",
+ ],
+ out: [
+ "android/hardware/graphics/allocator/2.0/Allocator.vts.h",
+ "android/hardware/graphics/allocator/2.0/types.vts.h",
+ ],
+}
+
+cc_library_shared {
+ name: "android.hardware.graphics.allocator@2.0-IAllocator-vts.profiler",
+ generated_sources: ["android.hardware.graphics.allocator@2.0-IAllocator-vts.profiler_genc++"],
+ generated_headers: ["android.hardware.graphics.allocator@2.0-IAllocator-vts.profiler_genc++_headers"],
+ export_generated_headers: ["android.hardware.graphics.allocator@2.0-IAllocator-vts.profiler_genc++_headers"],
+ shared_libs: [
+ "libbase",
+ "libhidlbase",
+ "libhidltransport",
+ "libvts_profiling",
+ "libvts_multidevice_proto",
+ "libprotobuf-cpp-full",
+ "android.hardware.graphics.common@1.0",
+ "android.hidl.base@1.0",
+ "android.hardware.graphics.allocator@2.0",
+ ],
+}
+
+genrule {
+ name: "android.hardware.graphics.allocator@2.0-IAllocatorClient-vts.profiler_genc++",
+ tools: ["hidl-gen", "vtsc"],
+ cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.graphics.allocator@2.0 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/graphics/allocator/2.0/ $(genDir)/android/hardware/graphics/allocator/2.0/",
+ srcs: [
+ "IAllocatorClient.hal",
+ "types.hal",
+ ],
+ out: [
+ "android/hardware/graphics/allocator/2.0/AllocatorClient.vts.cpp",
+ "android/hardware/graphics/allocator/2.0/types.vts.cpp",
+ ],
+}
+
+genrule {
+ name: "android.hardware.graphics.allocator@2.0-IAllocatorClient-vts.profiler_genc++_headers",
+ tools: ["hidl-gen", "vtsc"],
+ cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.graphics.allocator@2.0 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/graphics/allocator/2.0/ $(genDir)/android/hardware/graphics/allocator/2.0/",
+ srcs: [
+ "IAllocatorClient.hal",
+ "types.hal",
+ ],
+ out: [
+ "android/hardware/graphics/allocator/2.0/AllocatorClient.vts.h",
+ "android/hardware/graphics/allocator/2.0/types.vts.h",
+ ],
+}
+
+cc_library_shared {
+ name: "android.hardware.graphics.allocator@2.0-IAllocatorClient-vts.profiler",
+ generated_sources: ["android.hardware.graphics.allocator@2.0-IAllocatorClient-vts.profiler_genc++"],
+ generated_headers: ["android.hardware.graphics.allocator@2.0-IAllocatorClient-vts.profiler_genc++_headers"],
+ export_generated_headers: ["android.hardware.graphics.allocator@2.0-IAllocatorClient-vts.profiler_genc++_headers"],
+ shared_libs: [
+ "libbase",
+ "libhidlbase",
+ "libhidltransport",
+ "libvts_profiling",
+ "libvts_multidevice_proto",
+ "libprotobuf-cpp-full",
+ "android.hardware.graphics.common@1.0",
+ "android.hidl.base@1.0",
+ "android.hardware.graphics.allocator@2.0",
+ ],
+}
+
diff --git a/graphics/allocator/2.0/vts/Allocator.vts b/graphics/allocator/2.0/vts/Allocator.vts
index 04d4314..e767cbd 100644
--- a/graphics/allocator/2.0/vts/Allocator.vts
+++ b/graphics/allocator/2.0/vts/Allocator.vts
@@ -4,6 +4,7 @@
package: "android.hardware.graphics.allocator"
+import: "android.hardware.graphics.allocator@2.0::IAllocatorClient"
import: "android.hardware.graphics.allocator@2.0::types"
interface: {
@@ -21,36 +22,10 @@
scalar_value: {
int32_t: 1
}
- }
- }
-
- attribute: {
- name: "::android::hardware::graphics::allocator::V2_0::IAllocator::BufferDescriptorInfo"
- type: TYPE_STRUCT
- struct_value: {
- name: "width"
- type: TYPE_SCALAR
- scalar_type: "uint32_t"
- }
- struct_value: {
- name: "height"
- type: TYPE_SCALAR
- scalar_type: "uint32_t"
- }
- struct_value: {
- name: "format"
- type: TYPE_ENUM
- predefined_type: "::android::hardware::graphics::allocator::V2_0::PixelFormat"
- }
- struct_value: {
- name: "producerUsageMask"
- type: TYPE_SCALAR
- scalar_type: "uint64_t"
- }
- struct_value: {
- name: "consumerUsageMask"
- type: TYPE_SCALAR
- scalar_type: "uint64_t"
+ enumerator: "LAYERED_BUFFERS"
+ scalar_value: {
+ int32_t: 2
+ }
}
}
@@ -91,18 +66,15 @@
}
api: {
- name: "createDescriptor"
+ name: "createClient"
return_type_hidl: {
type: TYPE_ENUM
predefined_type: "::android::hardware::graphics::allocator::V2_0::Error"
}
return_type_hidl: {
- type: TYPE_SCALAR
- scalar_type: "uint64_t"
- }
- arg: {
- type: TYPE_STRUCT
- predefined_type: "::android::hardware::graphics::allocator::V2_0::IAllocator::BufferDescriptorInfo"
+ type: TYPE_HIDL_INTERFACE
+ predefined_type: "IAllocatorClient"
+ is_callback: false
}
callflow: {
entry: true
@@ -112,104 +84,4 @@
}
}
- api: {
- name: "destroyDescriptor"
- return_type_hidl: {
- type: TYPE_ENUM
- predefined_type: "::android::hardware::graphics::allocator::V2_0::Error"
- }
- arg: {
- type: TYPE_SCALAR
- scalar_type: "uint64_t"
- }
- callflow: {
- exit: true
- }
- callflow: {
- next: "*"
- }
- }
-
- api: {
- name: "testAllocate"
- return_type_hidl: {
- type: TYPE_ENUM
- predefined_type: "::android::hardware::graphics::allocator::V2_0::Error"
- }
- arg: {
- type: TYPE_VECTOR
- vector_value: {
- type: TYPE_SCALAR
- scalar_type: "uint64_t"
- }
- }
- callflow: {
- next: "allocate"
- }
- }
-
- api: {
- name: "allocate"
- return_type_hidl: {
- type: TYPE_ENUM
- predefined_type: "::android::hardware::graphics::allocator::V2_0::Error"
- }
- return_type_hidl: {
- type: TYPE_VECTOR
- vector_value: {
- type: TYPE_SCALAR
- scalar_type: "uint64_t"
- }
- }
- arg: {
- type: TYPE_VECTOR
- vector_value: {
- type: TYPE_SCALAR
- scalar_type: "uint64_t"
- }
- }
- callflow: {
- next: "exportHandle"
- }
- }
-
- api: {
- name: "free"
- return_type_hidl: {
- type: TYPE_ENUM
- predefined_type: "::android::hardware::graphics::allocator::V2_0::Error"
- }
- arg: {
- type: TYPE_SCALAR
- scalar_type: "uint64_t"
- }
- callflow: {
- exit: true
- }
- callflow: {
- next: "*"
- }
- }
-
- api: {
- name: "exportHandle"
- return_type_hidl: {
- type: TYPE_ENUM
- predefined_type: "::android::hardware::graphics::allocator::V2_0::Error"
- }
- return_type_hidl: {
- }
- arg: {
- type: TYPE_SCALAR
- scalar_type: "uint64_t"
- }
- arg: {
- type: TYPE_SCALAR
- scalar_type: "uint64_t"
- }
- callflow: {
- next: "free"
- }
- }
-
}
diff --git a/graphics/allocator/2.0/vts/AllocatorClient.vts b/graphics/allocator/2.0/vts/AllocatorClient.vts
index face060..2ab19f7 100644
--- a/graphics/allocator/2.0/vts/AllocatorClient.vts
+++ b/graphics/allocator/2.0/vts/AllocatorClient.vts
@@ -9,6 +9,472 @@
interface: {
attribute: {
+ name: "::android::hardware::graphics::common::V1_0::PixelFormat"
+ type: TYPE_ENUM
+ enum_value: {
+ scalar_type: "int32_t"
+
+ enumerator: "RGBA_8888"
+ scalar_value: {
+ int32_t: 1
+ }
+ enumerator: "RGBX_8888"
+ scalar_value: {
+ int32_t: 2
+ }
+ enumerator: "RGB_888"
+ scalar_value: {
+ int32_t: 3
+ }
+ enumerator: "RGB_565"
+ scalar_value: {
+ int32_t: 4
+ }
+ enumerator: "BGRA_8888"
+ scalar_value: {
+ int32_t: 5
+ }
+ enumerator: "RGBA_FP16"
+ scalar_value: {
+ int32_t: 22
+ }
+ enumerator: "YV12"
+ scalar_value: {
+ int32_t: 842094169
+ }
+ enumerator: "Y8"
+ scalar_value: {
+ int32_t: 538982489
+ }
+ enumerator: "Y16"
+ scalar_value: {
+ int32_t: 540422489
+ }
+ enumerator: "RAW16"
+ scalar_value: {
+ int32_t: 32
+ }
+ enumerator: "RAW10"
+ scalar_value: {
+ int32_t: 37
+ }
+ enumerator: "RAW12"
+ scalar_value: {
+ int32_t: 38
+ }
+ enumerator: "RAW_OPAQUE"
+ scalar_value: {
+ int32_t: 36
+ }
+ enumerator: "BLOB"
+ scalar_value: {
+ int32_t: 33
+ }
+ enumerator: "IMPLEMENTATION_DEFINED"
+ scalar_value: {
+ int32_t: 34
+ }
+ enumerator: "YCBCR_420_888"
+ scalar_value: {
+ int32_t: 35
+ }
+ enumerator: "YCBCR_422_888"
+ scalar_value: {
+ int32_t: 39
+ }
+ enumerator: "YCBCR_444_888"
+ scalar_value: {
+ int32_t: 40
+ }
+ enumerator: "FLEX_RGB_888"
+ scalar_value: {
+ int32_t: 41
+ }
+ enumerator: "FLEX_RGBA_8888"
+ scalar_value: {
+ int32_t: 42
+ }
+ enumerator: "YCBCR_422_SP"
+ scalar_value: {
+ int32_t: 16
+ }
+ enumerator: "YCRCB_420_SP"
+ scalar_value: {
+ int32_t: 17
+ }
+ enumerator: "YCBCR_422_I"
+ scalar_value: {
+ int32_t: 20
+ }
+ enumerator: "JPEG"
+ scalar_value: {
+ int32_t: 256
+ }
+ }
+ }
+
+ attribute: {
+ name: "::android::hardware::graphics::common::V1_0::Transform"
+ type: TYPE_ENUM
+ enum_value: {
+ scalar_type: "int32_t"
+
+ enumerator: "FLIP_H"
+ scalar_value: {
+ int32_t: 1
+ }
+ enumerator: "FLIP_V"
+ scalar_value: {
+ int32_t: 2
+ }
+ enumerator: "ROT_90"
+ scalar_value: {
+ int32_t: 4
+ }
+ enumerator: "ROT_180"
+ scalar_value: {
+ int32_t: 3
+ }
+ enumerator: "ROT_270"
+ scalar_value: {
+ int32_t: 7
+ }
+ }
+ }
+
+ attribute: {
+ name: "::android::hardware::graphics::common::V1_0::Dataspace"
+ type: TYPE_ENUM
+ enum_value: {
+ scalar_type: "int32_t"
+
+ enumerator: "UNKNOWN"
+ scalar_value: {
+ int32_t: 0
+ }
+ enumerator: "ARBITRARY"
+ scalar_value: {
+ int32_t: 1
+ }
+ enumerator: "STANDARD_SHIFT"
+ scalar_value: {
+ int32_t: 16
+ }
+ enumerator: "STANDARD_MASK"
+ scalar_value: {
+ int32_t: 4128768
+ }
+ enumerator: "STANDARD_UNSPECIFIED"
+ scalar_value: {
+ int32_t: 0
+ }
+ enumerator: "STANDARD_BT709"
+ scalar_value: {
+ int32_t: 65536
+ }
+ enumerator: "STANDARD_BT601_625"
+ scalar_value: {
+ int32_t: 131072
+ }
+ enumerator: "STANDARD_BT601_625_UNADJUSTED"
+ scalar_value: {
+ int32_t: 196608
+ }
+ enumerator: "STANDARD_BT601_525"
+ scalar_value: {
+ int32_t: 262144
+ }
+ enumerator: "STANDARD_BT601_525_UNADJUSTED"
+ scalar_value: {
+ int32_t: 327680
+ }
+ enumerator: "STANDARD_BT2020"
+ scalar_value: {
+ int32_t: 393216
+ }
+ enumerator: "STANDARD_BT2020_CONSTANT_LUMINANCE"
+ scalar_value: {
+ int32_t: 458752
+ }
+ enumerator: "STANDARD_BT470M"
+ scalar_value: {
+ int32_t: 524288
+ }
+ enumerator: "STANDARD_FILM"
+ scalar_value: {
+ int32_t: 589824
+ }
+ enumerator: "STANDARD_DCI_P3"
+ scalar_value: {
+ int32_t: 655360
+ }
+ enumerator: "STANDARD_ADOBE_RGB"
+ scalar_value: {
+ int32_t: 720896
+ }
+ enumerator: "TRANSFER_SHIFT"
+ scalar_value: {
+ int32_t: 22
+ }
+ enumerator: "TRANSFER_MASK"
+ scalar_value: {
+ int32_t: 130023424
+ }
+ enumerator: "TRANSFER_UNSPECIFIED"
+ scalar_value: {
+ int32_t: 0
+ }
+ enumerator: "TRANSFER_LINEAR"
+ scalar_value: {
+ int32_t: 4194304
+ }
+ enumerator: "TRANSFER_SRGB"
+ scalar_value: {
+ int32_t: 8388608
+ }
+ enumerator: "TRANSFER_SMPTE_170M"
+ scalar_value: {
+ int32_t: 12582912
+ }
+ enumerator: "TRANSFER_GAMMA2_2"
+ scalar_value: {
+ int32_t: 16777216
+ }
+ enumerator: "TRANSFER_GAMMA2_6"
+ scalar_value: {
+ int32_t: 20971520
+ }
+ enumerator: "TRANSFER_GAMMA2_8"
+ scalar_value: {
+ int32_t: 25165824
+ }
+ enumerator: "TRANSFER_ST2084"
+ scalar_value: {
+ int32_t: 29360128
+ }
+ enumerator: "TRANSFER_HLG"
+ scalar_value: {
+ int32_t: 33554432
+ }
+ enumerator: "RANGE_SHIFT"
+ scalar_value: {
+ int32_t: 27
+ }
+ enumerator: "RANGE_MASK"
+ scalar_value: {
+ int32_t: 939524096
+ }
+ enumerator: "RANGE_UNSPECIFIED"
+ scalar_value: {
+ int32_t: 0
+ }
+ enumerator: "RANGE_FULL"
+ scalar_value: {
+ int32_t: 134217728
+ }
+ enumerator: "RANGE_LIMITED"
+ scalar_value: {
+ int32_t: 268435456
+ }
+ enumerator: "RANGE_EXTENDED"
+ scalar_value: {
+ int32_t: 402653184
+ }
+ enumerator: "SRGB_LINEAR"
+ scalar_value: {
+ int32_t: 512
+ }
+ enumerator: "V0_SRGB_LINEAR"
+ scalar_value: {
+ int32_t: 138477568
+ }
+ enumerator: "V0_SCRGB_LINEAR"
+ scalar_value: {
+ int32_t: 406913024
+ }
+ enumerator: "SRGB"
+ scalar_value: {
+ int32_t: 513
+ }
+ enumerator: "V0_SRGB"
+ scalar_value: {
+ int32_t: 142671872
+ }
+ enumerator: "V0_SCRGB"
+ scalar_value: {
+ int32_t: 411107328
+ }
+ enumerator: "JFIF"
+ scalar_value: {
+ int32_t: 257
+ }
+ enumerator: "V0_JFIF"
+ scalar_value: {
+ int32_t: 146931712
+ }
+ enumerator: "BT601_625"
+ scalar_value: {
+ int32_t: 258
+ }
+ enumerator: "V0_BT601_625"
+ scalar_value: {
+ int32_t: 281149440
+ }
+ enumerator: "BT601_525"
+ scalar_value: {
+ int32_t: 259
+ }
+ enumerator: "V0_BT601_525"
+ scalar_value: {
+ int32_t: 281280512
+ }
+ enumerator: "BT709"
+ scalar_value: {
+ int32_t: 260
+ }
+ enumerator: "V0_BT709"
+ scalar_value: {
+ int32_t: 281083904
+ }
+ enumerator: "DCI_P3_LINEAR"
+ scalar_value: {
+ int32_t: 139067392
+ }
+ enumerator: "DCI_P3"
+ scalar_value: {
+ int32_t: 155844608
+ }
+ enumerator: "DISPLAY_P3_LINEAR"
+ scalar_value: {
+ int32_t: 139067392
+ }
+ enumerator: "DISPLAY_P3"
+ scalar_value: {
+ int32_t: 143261696
+ }
+ enumerator: "ADOBE_RGB"
+ scalar_value: {
+ int32_t: 151715840
+ }
+ enumerator: "BT2020_LINEAR"
+ scalar_value: {
+ int32_t: 138805248
+ }
+ enumerator: "BT2020"
+ scalar_value: {
+ int32_t: 147193856
+ }
+ enumerator: "DEPTH"
+ scalar_value: {
+ int32_t: 4096
+ }
+ }
+ }
+
+ attribute: {
+ name: "::android::hardware::graphics::common::V1_0::ColorMode"
+ type: TYPE_ENUM
+ enum_value: {
+ scalar_type: "int32_t"
+
+ enumerator: "NATIVE"
+ scalar_value: {
+ int32_t: 0
+ }
+ enumerator: "STANDARD_BT601_625"
+ scalar_value: {
+ int32_t: 1
+ }
+ enumerator: "STANDARD_BT601_625_UNADJUSTED"
+ scalar_value: {
+ int32_t: 2
+ }
+ enumerator: "STANDARD_BT601_525"
+ scalar_value: {
+ int32_t: 3
+ }
+ enumerator: "STANDARD_BT601_525_UNADJUSTED"
+ scalar_value: {
+ int32_t: 4
+ }
+ enumerator: "STANDARD_BT709"
+ scalar_value: {
+ int32_t: 5
+ }
+ enumerator: "DCI_P3"
+ scalar_value: {
+ int32_t: 6
+ }
+ enumerator: "SRGB"
+ scalar_value: {
+ int32_t: 7
+ }
+ enumerator: "ADOBE_RGB"
+ scalar_value: {
+ int32_t: 8
+ }
+ }
+ }
+
+ attribute: {
+ name: "::android::hardware::graphics::common::V1_0::ColorTransform"
+ type: TYPE_ENUM
+ enum_value: {
+ scalar_type: "int32_t"
+
+ enumerator: "IDENTITY"
+ scalar_value: {
+ int32_t: 0
+ }
+ enumerator: "ARBITRARY_MATRIX"
+ scalar_value: {
+ int32_t: 1
+ }
+ enumerator: "VALUE_INVERSE"
+ scalar_value: {
+ int32_t: 2
+ }
+ enumerator: "GRAYSCALE"
+ scalar_value: {
+ int32_t: 3
+ }
+ enumerator: "CORRECT_PROTANOPIA"
+ scalar_value: {
+ int32_t: 4
+ }
+ enumerator: "CORRECT_DEUTERANOPIA"
+ scalar_value: {
+ int32_t: 5
+ }
+ enumerator: "CORRECT_TRITANOPIA"
+ scalar_value: {
+ int32_t: 6
+ }
+ }
+ }
+
+ attribute: {
+ name: "::android::hardware::graphics::common::V1_0::Hdr"
+ type: TYPE_ENUM
+ enum_value: {
+ scalar_type: "int32_t"
+
+ enumerator: "DOLBY_VISION"
+ scalar_value: {
+ int32_t: 1
+ }
+ enumerator: "HDR10"
+ scalar_value: {
+ int32_t: 2
+ }
+ enumerator: "HLG"
+ scalar_value: {
+ int32_t: 3
+ }
+ }
+ }
+
+ attribute: {
name: "::android::hardware::graphics::allocator::V2_0::IAllocatorClient::BufferDescriptorInfo"
type: TYPE_STRUCT
struct_value: {
diff --git a/graphics/allocator/2.0/vts/types.vts b/graphics/allocator/2.0/vts/types.vts
index ac1bf3f..2b7e47a 100644
--- a/graphics/allocator/2.0/vts/types.vts
+++ b/graphics/allocator/2.0/vts/types.vts
@@ -132,100 +132,3 @@
}
}
-attribute: {
- name: "::android::hardware::graphics::allocator::V2_0::PixelFormat"
- type: TYPE_ENUM
- enum_value: {
- scalar_type: "int32_t"
-
- enumerator: "RGBA_8888"
- scalar_value: {
- int32_t: 1
- }
- enumerator: "RGBX_8888"
- scalar_value: {
- int32_t: 2
- }
- enumerator: "RGB_888"
- scalar_value: {
- int32_t: 3
- }
- enumerator: "RGB_565"
- scalar_value: {
- int32_t: 4
- }
- enumerator: "BGRA_8888"
- scalar_value: {
- int32_t: 5
- }
- enumerator: "YV12"
- scalar_value: {
- int32_t: 842094169
- }
- enumerator: "Y8"
- scalar_value: {
- int32_t: 538982489
- }
- enumerator: "Y16"
- scalar_value: {
- int32_t: 540422489
- }
- enumerator: "RAW16"
- scalar_value: {
- int32_t: 32
- }
- enumerator: "RAW10"
- scalar_value: {
- int32_t: 37
- }
- enumerator: "RAW12"
- scalar_value: {
- int32_t: 38
- }
- enumerator: "RAW_OPAQUE"
- scalar_value: {
- int32_t: 36
- }
- enumerator: "BLOB"
- scalar_value: {
- int32_t: 33
- }
- enumerator: "IMPLEMENTATION_DEFINED"
- scalar_value: {
- int32_t: 34
- }
- enumerator: "YCbCr_420_888"
- scalar_value: {
- int32_t: 35
- }
- enumerator: "YCbCr_422_888"
- scalar_value: {
- int32_t: 39
- }
- enumerator: "YCbCr_444_888"
- scalar_value: {
- int32_t: 40
- }
- enumerator: "FLEX_RGB_888"
- scalar_value: {
- int32_t: 41
- }
- enumerator: "FLEX_RGBA_8888"
- scalar_value: {
- int32_t: 42
- }
- enumerator: "YCbCr_422_SP"
- scalar_value: {
- int32_t: 16
- }
- enumerator: "YCrCb_420_SP"
- scalar_value: {
- int32_t: 17
- }
- enumerator: "YCbCr_422_I"
- scalar_value: {
- int32_t: 20
- }
- }
-}
-
diff --git a/graphics/common/1.0/Android.bp b/graphics/common/1.0/Android.bp
index b67afd1..721c632 100644
--- a/graphics/common/1.0/Android.bp
+++ b/graphics/common/1.0/Android.bp
@@ -44,3 +44,55 @@
"libutils",
],
}
+
+genrule {
+ name: "android.hardware.graphics.common.vts.driver@1.0_genc++",
+ tools: ["hidl-gen", "vtsc"],
+ cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.graphics.common@1.0 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/graphics/common/1.0/ $(genDir)/android/hardware/graphics/common/1.0/",
+ srcs: [
+ "types.hal",
+ ],
+ out: [
+ "android/hardware/graphics/common/1.0/types.vts.cpp",
+ ],
+}
+
+genrule {
+ name: "android.hardware.graphics.common.vts.driver@1.0_genc++_headers",
+ tools: ["hidl-gen", "vtsc"],
+ cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.graphics.common@1.0 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/graphics/common/1.0/ $(genDir)/android/hardware/graphics/common/1.0/",
+ srcs: [
+ "types.hal",
+ ],
+ out: [
+ "android/hardware/graphics/common/1.0/types.vts.h",
+ ],
+}
+
+cc_library_shared {
+ name: "android.hardware.graphics.common.vts.driver@1.0",
+ generated_sources: ["android.hardware.graphics.common.vts.driver@1.0_genc++"],
+ generated_headers: ["android.hardware.graphics.common.vts.driver@1.0_genc++_headers"],
+ export_generated_headers: ["android.hardware.graphics.common.vts.driver@1.0_genc++_headers"],
+ shared_libs: [
+ "libhidlbase",
+ "libhidltransport",
+ "libhwbinder",
+ "liblog",
+ "libutils",
+ "libcutils",
+ "libvts_common",
+ "libvts_datatype",
+ "libvts_measurement",
+ "libvts_multidevice_proto",
+ "libcamera_metadata",
+ "libprotobuf-cpp-full",
+ "android.hardware.graphics.common@1.0",
+ ],
+ export_shared_lib_headers: [
+ "libhidlbase",
+ "libhidltransport",
+ "libhwbinder",
+ "libutils",
+ ],
+}
\ No newline at end of file