Merge "Bump android.hardware.graphics.common V4->V5" into main

This commit is contained in:
Sergiu Ferentz 2023-10-09 08:27:26 +00:00 committed by Android (Google) Code Review
commit 31b637fd90
8 changed files with 20 additions and 20 deletions

View file

@ -30,7 +30,7 @@ aidl_interface {
stability: "vintf",
imports: [
"android.hardware.common-V2",
"android.hardware.graphics.common-V4",
"android.hardware.graphics.common-V5",
],
backend: {
java: {
@ -53,14 +53,14 @@ aidl_interface {
version: "1",
imports: [
"android.hardware.common-V2",
"android.hardware.graphics.common-V4",
"android.hardware.graphics.common-V5",
],
},
{
version: "2",
imports: [
"android.hardware.common-V2",
"android.hardware.graphics.common-V4",
"android.hardware.graphics.common-V5",
],
},

View file

@ -18,7 +18,7 @@ aidl_interface {
"android.hardware.common.fmq-V1",
"android.hardware.camera.common-V1",
"android.hardware.camera.metadata-V2",
"android.hardware.graphics.common-V4",
"android.hardware.graphics.common-V5",
],
backend: {
cpp: {
@ -37,7 +37,7 @@ aidl_interface {
"android.hardware.common.fmq-V1",
"android.hardware.camera.common-V1",
"android.hardware.camera.metadata-V1",
"android.hardware.graphics.common-V4",
"android.hardware.graphics.common-V5",
],
},
{
@ -47,7 +47,7 @@ aidl_interface {
"android.hardware.common.fmq-V1",
"android.hardware.camera.common-V1",
"android.hardware.camera.metadata-V2",
"android.hardware.graphics.common-V4",
"android.hardware.graphics.common-V5",
],
},

View file

@ -39,14 +39,14 @@ cc_defaults {
cc_defaults {
name: "android.hardware.graphics.common-ndk_static",
static_libs: [
"android.hardware.graphics.common-V4-ndk",
"android.hardware.graphics.common-V5-ndk",
],
}
cc_defaults {
name: "android.hardware.graphics.common-ndk_shared",
shared_libs: [
"android.hardware.graphics.common-V4-ndk",
"android.hardware.graphics.common-V5-ndk",
],
}

View file

@ -18,7 +18,7 @@ aidl_interface {
srcs: ["android/hardware/graphics/allocator/*.aidl"],
imports: [
"android.hardware.common-V2",
"android.hardware.graphics.common-V4",
"android.hardware.graphics.common-V5",
],
stability: "vintf",
backend: {
@ -49,7 +49,7 @@ aidl_interface {
version: "2",
imports: [
"android.hardware.common-V2",
"android.hardware.graphics.common-V4",
"android.hardware.graphics.common-V5",
],
},

View file

@ -15,7 +15,7 @@ aidl_interface {
enabled: true,
support_system_process: true,
},
vndk_use_version: "4",
vndk_use_version: "5",
srcs: [
"android/hardware/graphics/common/*.aidl",
],

View file

@ -38,7 +38,7 @@ aidl_interface {
],
stability: "vintf",
imports: [
"android.hardware.graphics.common-V4",
"android.hardware.graphics.common-V5",
"android.hardware.common-V2",
],
backend: {
@ -62,14 +62,14 @@ aidl_interface {
{
version: "1",
imports: [
"android.hardware.graphics.common-V4",
"android.hardware.graphics.common-V5",
"android.hardware.common-V2",
],
},
{
version: "2",
imports: [
"android.hardware.graphics.common-V4",
"android.hardware.graphics.common-V5",
"android.hardware.common-V2",
],
},

View file

@ -47,7 +47,7 @@ cc_library_static {
],
export_static_lib_headers: [
"android.hardware.graphics.allocator@4.0",
"android.hardware.graphics.common-V4-ndk",
"android.hardware.graphics.common-V5-ndk",
"android.hardware.graphics.mapper@4.0",
],
export_include_dirs: ["include"],

View file

@ -17,7 +17,7 @@ aidl_interface {
stability: "vintf",
imports: [
"android.hardware.common-V2",
"android.hardware.graphics.common-V4",
"android.hardware.graphics.common-V5",
],
backend: {
java: {
@ -40,28 +40,28 @@ aidl_interface {
version: "1",
imports: [
"android.hardware.common-V2",
"android.hardware.graphics.common-V4",
"android.hardware.graphics.common-V5",
],
},
{
version: "2",
imports: [
"android.hardware.common-V2",
"android.hardware.graphics.common-V4",
"android.hardware.graphics.common-V5",
],
},
{
version: "3",
imports: [
"android.hardware.common-V2",
"android.hardware.graphics.common-V4",
"android.hardware.graphics.common-V5",
],
},
{
version: "4",
imports: [
"android.hardware.common-V2",
"android.hardware.graphics.common-V4",
"android.hardware.graphics.common-V5",
],
},