Merge "Graphics: Migrate graphics.common HAL to version 6" into main

This commit is contained in:
Eino-Ville Talvala (Eddy)
2024-11-15 19:01:02 +00:00
committed by Android (Google) Code Review
7 changed files with 18 additions and 18 deletions

View File

@@ -55,14 +55,14 @@ aidl_interface {
version: "1",
imports: [
"android.hardware.common-V2",
"android.hardware.graphics.common-V5",
"android.hardware.graphics.common-V6",
],
},
{
version: "2",
imports: [
"android.hardware.common-V2",
"android.hardware.graphics.common-V5",
"android.hardware.graphics.common-V6",
],
},

View File

@@ -44,7 +44,7 @@ aidl_interface {
"android.hardware.common.fmq-V1",
"android.hardware.camera.common-V1",
"android.hardware.camera.metadata-V1",
"android.hardware.graphics.common-V5",
"android.hardware.graphics.common-V6",
],
},
{
@@ -54,7 +54,7 @@ aidl_interface {
"android.hardware.common.fmq-V1",
"android.hardware.camera.common-V1",
"android.hardware.camera.metadata-V2",
"android.hardware.graphics.common-V5",
"android.hardware.graphics.common-V6",
],
},
{
@@ -64,7 +64,7 @@ aidl_interface {
"android.hardware.common.fmq-V1",
"android.hardware.camera.common-V1",
"android.hardware.camera.metadata-V3",
"android.hardware.graphics.common-V5",
"android.hardware.graphics.common-V6",
],
},

View File

@@ -64,14 +64,14 @@ cc_defaults {
aidl_interface_defaults {
name: "android.hardware.graphics.common-latest",
imports: [
"android.hardware.graphics.common-V5",
"android.hardware.graphics.common-V6",
],
}
rust_defaults {
name: "android.hardware.graphics.common-latest-rust",
rustlibs: [
"android.hardware.graphics.common-V5-rust",
"android.hardware.graphics.common-V6-rust",
],
}
@@ -80,7 +80,7 @@ cc_defaults {
target: {
linux: {
static_libs: [
"android.hardware.graphics.common-V5-ndk",
"android.hardware.graphics.common-V6-ndk",
],
},
},
@@ -91,7 +91,7 @@ cc_defaults {
target: {
linux: {
shared_libs: [
"android.hardware.graphics.common-V5-ndk",
"android.hardware.graphics.common-V6-ndk",
],
},
},

View File

@@ -45,7 +45,7 @@ aidl_interface {
version: "2",
imports: [
"android.hardware.common-V2",
"android.hardware.graphics.common-V5",
"android.hardware.graphics.common-V6",
],
},

View File

@@ -59,21 +59,21 @@ aidl_interface {
{
version: "1",
imports: [
"android.hardware.graphics.common-V5",
"android.hardware.graphics.common-V6",
"android.hardware.common-V2",
],
},
{
version: "2",
imports: [
"android.hardware.graphics.common-V5",
"android.hardware.graphics.common-V6",
"android.hardware.common-V2",
],
},
{
version: "3",
imports: [
"android.hardware.graphics.common-V5",
"android.hardware.graphics.common-V6",
"android.hardware.common-V2",
],
},

View File

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

View File

@@ -43,28 +43,28 @@ aidl_interface {
version: "1",
imports: [
"android.hardware.common-V2",
"android.hardware.graphics.common-V5",
"android.hardware.graphics.common-V6",
],
},
{
version: "2",
imports: [
"android.hardware.common-V2",
"android.hardware.graphics.common-V5",
"android.hardware.graphics.common-V6",
],
},
{
version: "3",
imports: [
"android.hardware.common-V2",
"android.hardware.graphics.common-V5",
"android.hardware.graphics.common-V6",
],
},
{
version: "4",
imports: [
"android.hardware.common-V2",
"android.hardware.graphics.common-V5",
"android.hardware.graphics.common-V6",
],
},