graphics.common V3 -> V4

Bug: 251177105
Test: m
Change-Id: I1cb84ec85f98789d0737207a1661b39a25538c96
Merged-In: I1cb84ec85f98789d0737207a1661b39a25538c96
Merged-In: I2e1561f4ccb59a2a833af9a7afd07840ab2ebfa4
This commit is contained in:
Marc Kassis
2022-11-14 14:45:16 +01:00
parent 8333cda898
commit 132900f4e1
16 changed files with 32 additions and 28 deletions

View File

@@ -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",
],
},
],

View File

@@ -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",

View File

@@ -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: [

View File

@@ -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",
],
},
],

View File

@@ -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",

View File

@@ -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",
],
}

View File

@@ -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: {

View File

@@ -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",

View File

@@ -39,4 +39,5 @@ enum Hdr {
HDR10 = 2,
HLG = 3,
HDR10_PLUS = 4,
DOLBY_VISION_4K30 = 5,
}

View File

@@ -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,
}

View File

@@ -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",
],
},

View File

@@ -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",

View File

@@ -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"],

View File

@@ -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",

View File

@@ -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",
],
},

View File

@@ -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",
],