From 9c428fe3edbb4c35950e4bb02101c8d33ce49ed3 Mon Sep 17 00:00:00 2001 From: Marc Kassis Date: Tue, 8 Nov 2022 16:21:33 +0100 Subject: [PATCH] graphics.common V3 -> V4 Bug: 251177105 Test: m Change-Id: I816b8e14a0741402090cdc4732c2a904e830ff4e Merged-In: I1cb84ec85f98789d0737207a1661b39a25538c96 Merged-In: I2e1561f4ccb59a2a833af9a7afd07840ab2ebfa4 --- automotive/evs/aidl/Android.bp | 4 ++-- automotive/evs/aidl/impl/Android.bp | 2 +- automotive/evs/aidl/vts/Android.bp | 9 ++++----- camera/device/aidl/Android.bp | 2 +- camera/provider/aidl/vts/Android.bp | 2 +- graphics/Android.bp | 4 ++-- graphics/allocator/aidl/Android.bp | 2 +- graphics/common/aidl/Android.bp | 4 ++-- .../current/android/hardware/graphics/common/Hdr.aidl | 1 + .../aidl/android/hardware/graphics/common/Hdr.aidl | 4 ++++ graphics/composer/aidl/Android.bp | 4 ++-- graphics/composer/aidl/vts/Android.bp | 2 +- graphics/mapper/4.0/utils/vts/Android.bp | 4 ++-- graphics/mapper/4.0/vts/functional/Android.bp | 2 +- neuralnetworks/aidl/Android.bp | 10 +++++----- neuralnetworks/aidl/utils/Android.bp | 4 ++-- 16 files changed, 32 insertions(+), 28 deletions(-) diff --git a/automotive/evs/aidl/Android.bp b/automotive/evs/aidl/Android.bp index 1c908aa60d..8aaa1ced54 100644 --- a/automotive/evs/aidl/Android.bp +++ b/automotive/evs/aidl/Android.bp @@ -30,7 +30,7 @@ aidl_interface { stability: "vintf", imports: [ "android.hardware.common-V2", - "android.hardware.graphics.common-V3", + "android.hardware.graphics.common-V4", ], backend: { java: { @@ -53,7 +53,7 @@ aidl_interface { version: "1", imports: [ "android.hardware.common-V2", - "android.hardware.graphics.common-V3", + "android.hardware.graphics.common-V4", ], }, ], diff --git a/automotive/evs/aidl/impl/Android.bp b/automotive/evs/aidl/impl/Android.bp index 7eb01166c3..d907047c1b 100644 --- a/automotive/evs/aidl/impl/Android.bp +++ b/automotive/evs/aidl/impl/Android.bp @@ -23,7 +23,7 @@ cc_defaults { static_libs: [ "android.hardware.automotive.evs-V1-ndk", "android.hardware.common-V2-ndk", - "android.hardware.graphics.common-V3-ndk", + "android.hardware.graphics.common-V4-ndk", ], shared_libs: [ "libbase", diff --git a/automotive/evs/aidl/vts/Android.bp b/automotive/evs/aidl/vts/Android.bp index 980c6d5a5c..e2e5b93e30 100644 --- a/automotive/evs/aidl/vts/Android.bp +++ b/automotive/evs/aidl/vts/Android.bp @@ -14,18 +14,17 @@ // limitations under the License. // -package{ +package { // See: http://go/android-license-faq // A large-scale-change added 'default_applicable_licenses' to import // all of the 'license_kinds' from "hardware_interfaces_license" // to get the below license kinds: // SPDX-license-identifier-Apache-2.0 - default_applicable_licenses : ["hardware_interfaces_license"], + default_applicable_licenses: ["hardware_interfaces_license"], } cc_test { -name: - "VtsHalEvsTargetTest", + name: "VtsHalEvsTargetTest", srcs: [ "*.cpp", ], @@ -43,7 +42,7 @@ name: "android.hardware.automotive.evs@common-default-lib", "android.hardware.automotive.evs-V1-ndk", "android.hardware.common-V2-ndk", - "android.hardware.graphics.common-V3-ndk", + "android.hardware.graphics.common-V4-ndk", "libaidlcommonsupport", ], test_suites: [ diff --git a/camera/device/aidl/Android.bp b/camera/device/aidl/Android.bp index 365a5ff07f..6115d53933 100644 --- a/camera/device/aidl/Android.bp +++ b/camera/device/aidl/Android.bp @@ -36,7 +36,7 @@ aidl_interface { "android.hardware.common.fmq-V1", "android.hardware.camera.common-V1", "android.hardware.camera.metadata-V1", - "android.hardware.graphics.common-V3", + "android.hardware.graphics.common-V4", ], }, ], diff --git a/camera/provider/aidl/vts/Android.bp b/camera/provider/aidl/vts/Android.bp index 727ef03e72..f17de3adfa 100644 --- a/camera/provider/aidl/vts/Android.bp +++ b/camera/provider/aidl/vts/Android.bp @@ -61,7 +61,7 @@ cc_test { "android.hardware.camera.device-V1-ndk", "android.hardware.camera.metadata-V1-ndk", "android.hardware.camera.provider-V1-ndk", - "android.hardware.graphics.common-V3-ndk", + "android.hardware.graphics.common-V4-ndk", "android.hidl.allocator@1.0", "libgrallocusage", "libhidlmemory", diff --git a/graphics/Android.bp b/graphics/Android.bp index cdd81ed54a..4c51454233 100644 --- a/graphics/Android.bp +++ b/graphics/Android.bp @@ -33,14 +33,14 @@ cc_defaults { cc_defaults { name: "android.hardware.graphics.common-ndk_static", static_libs: [ - "android.hardware.graphics.common-V3-ndk", + "android.hardware.graphics.common-V4-ndk", ], } cc_defaults { name: "android.hardware.graphics.common-ndk_shared", shared_libs: [ - "android.hardware.graphics.common-V3-ndk", + "android.hardware.graphics.common-V4-ndk", ], } diff --git a/graphics/allocator/aidl/Android.bp b/graphics/allocator/aidl/Android.bp index 66a7603c90..67c7fb5e29 100644 --- a/graphics/allocator/aidl/Android.bp +++ b/graphics/allocator/aidl/Android.bp @@ -18,7 +18,7 @@ aidl_interface { srcs: ["android/hardware/graphics/allocator/*.aidl"], imports: [ "android.hardware.common-V2", - "android.hardware.graphics.common-V3", + "android.hardware.graphics.common-V4", ], stability: "vintf", backend: { diff --git a/graphics/common/aidl/Android.bp b/graphics/common/aidl/Android.bp index 3fddc9fccd..84bc1afd1e 100644 --- a/graphics/common/aidl/Android.bp +++ b/graphics/common/aidl/Android.bp @@ -15,7 +15,7 @@ aidl_interface { enabled: true, support_system_process: true, }, - vndk_use_version: "3", + vndk_use_version: "4", srcs: [ "android/hardware/graphics/common/*.aidl", ], @@ -40,7 +40,7 @@ aidl_interface { min_sdk_version: "29", }, }, - frozen: true, + frozen: false, versions_with_info: [ { version: "1", diff --git a/graphics/common/aidl/aidl_api/android.hardware.graphics.common/current/android/hardware/graphics/common/Hdr.aidl b/graphics/common/aidl/aidl_api/android.hardware.graphics.common/current/android/hardware/graphics/common/Hdr.aidl index 7bae45e949..128ef4917f 100644 --- a/graphics/common/aidl/aidl_api/android.hardware.graphics.common/current/android/hardware/graphics/common/Hdr.aidl +++ b/graphics/common/aidl/aidl_api/android.hardware.graphics.common/current/android/hardware/graphics/common/Hdr.aidl @@ -39,4 +39,5 @@ enum Hdr { HDR10 = 2, HLG = 3, HDR10_PLUS = 4, + DOLBY_VISION_4K30 = 5, } diff --git a/graphics/common/aidl/android/hardware/graphics/common/Hdr.aidl b/graphics/common/aidl/android/hardware/graphics/common/Hdr.aidl index f543780d65..407b54f524 100644 --- a/graphics/common/aidl/android/hardware/graphics/common/Hdr.aidl +++ b/graphics/common/aidl/android/hardware/graphics/common/Hdr.aidl @@ -39,4 +39,8 @@ enum Hdr { * Device supports HDR10+ */ HDR10_PLUS = 4, + /** + * If present, indicates that device supports Dolby Vision only up to 4k30hz graphics mode + */ + DOLBY_VISION_4K30 = 5, } diff --git a/graphics/composer/aidl/Android.bp b/graphics/composer/aidl/Android.bp index 56e6ed2de9..3e2b79c743 100644 --- a/graphics/composer/aidl/Android.bp +++ b/graphics/composer/aidl/Android.bp @@ -37,7 +37,7 @@ aidl_interface { ], stability: "vintf", imports: [ - "android.hardware.graphics.common-V3", + "android.hardware.graphics.common-V4", "android.hardware.common-V2", ], backend: { @@ -58,7 +58,7 @@ aidl_interface { { version: "1", imports: [ - "android.hardware.graphics.common-V3", + "android.hardware.graphics.common-V4", "android.hardware.common-V2", ], }, diff --git a/graphics/composer/aidl/vts/Android.bp b/graphics/composer/aidl/vts/Android.bp index 1e70a0ec45..84fd76af71 100644 --- a/graphics/composer/aidl/vts/Android.bp +++ b/graphics/composer/aidl/vts/Android.bp @@ -68,7 +68,7 @@ cc_test { ], static_libs: [ "android.hardware.graphics.composer3-V1-ndk", - "android.hardware.graphics.common-V3-ndk", + "android.hardware.graphics.common-V4-ndk", "android.hardware.graphics.common@1.2", "android.hardware.common-V2-ndk", "android.hardware.common.fmq-V1-ndk", diff --git a/graphics/mapper/4.0/utils/vts/Android.bp b/graphics/mapper/4.0/utils/vts/Android.bp index 269b972ded..d808559c86 100644 --- a/graphics/mapper/4.0/utils/vts/Android.bp +++ b/graphics/mapper/4.0/utils/vts/Android.bp @@ -37,7 +37,7 @@ cc_library_static { ], static_libs: [ "android.hardware.graphics.allocator@4.0", - "android.hardware.graphics.common-V3-ndk", + "android.hardware.graphics.common-V4-ndk", "android.hardware.graphics.mapper@4.0", "libaidlcommonsupport", ], @@ -48,7 +48,7 @@ cc_library_static { ], export_static_lib_headers: [ "android.hardware.graphics.allocator@4.0", - "android.hardware.graphics.common-V3-ndk", + "android.hardware.graphics.common-V4-ndk", "android.hardware.graphics.mapper@4.0", ], export_include_dirs: ["include"], diff --git a/graphics/mapper/4.0/vts/functional/Android.bp b/graphics/mapper/4.0/vts/functional/Android.bp index 8f3e7ebee9..ebdc4ec7e8 100644 --- a/graphics/mapper/4.0/vts/functional/Android.bp +++ b/graphics/mapper/4.0/vts/functional/Android.bp @@ -33,7 +33,7 @@ cc_test { ], srcs: ["VtsHalGraphicsMapperV4_0TargetTest.cpp"], static_libs: [ - "android.hardware.graphics.common-V3-ndk", + "android.hardware.graphics.common-V4-ndk", "android.hardware.graphics.mapper@4.0-vts", "libaidlcommonsupport", "libgralloctypes", diff --git a/neuralnetworks/aidl/Android.bp b/neuralnetworks/aidl/Android.bp index db1188d814..be868797d1 100644 --- a/neuralnetworks/aidl/Android.bp +++ b/neuralnetworks/aidl/Android.bp @@ -17,7 +17,7 @@ aidl_interface { stability: "vintf", imports: [ "android.hardware.common-V2", - "android.hardware.graphics.common-V3", + "android.hardware.graphics.common-V4", ], backend: { java: { @@ -40,28 +40,28 @@ aidl_interface { version: "1", imports: [ "android.hardware.common-V2", - "android.hardware.graphics.common-V3", + "android.hardware.graphics.common-V4", ], }, { version: "2", imports: [ "android.hardware.common-V2", - "android.hardware.graphics.common-V3", + "android.hardware.graphics.common-V4", ], }, { version: "3", imports: [ "android.hardware.common-V2", - "android.hardware.graphics.common-V3", + "android.hardware.graphics.common-V4", ], }, { version: "4", imports: [ "android.hardware.common-V2", - "android.hardware.graphics.common-V3", + "android.hardware.graphics.common-V4", ], }, diff --git a/neuralnetworks/aidl/utils/Android.bp b/neuralnetworks/aidl/utils/Android.bp index 325809213c..1347f60580 100644 --- a/neuralnetworks/aidl/utils/Android.bp +++ b/neuralnetworks/aidl/utils/Android.bp @@ -38,7 +38,7 @@ cc_defaults { export_include_dirs: ["include"], cflags: ["-Wthread-safety"], static_libs: [ - "android.hardware.graphics.common-V3-ndk", + "android.hardware.graphics.common-V4-ndk", "libaidlcommonsupport", "libarect", "neuralnetworks_types", @@ -92,7 +92,7 @@ cc_defaults { name: "neuralnetworks_use_latest_utils_hal_aidl", static_libs: [ "android.hardware.common-V2-ndk", - "android.hardware.graphics.common-V3-ndk", + "android.hardware.graphics.common-V4-ndk", "android.hardware.neuralnetworks-V4-ndk", "neuralnetworks_utils_hal_aidl", ],