Merge "graphics.common V3 -> V4"
This commit is contained in:
commit
eaa8469b7c
7 changed files with 15 additions and 15 deletions
|
@ -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",
|
||||
],
|
||||
},
|
||||
],
|
||||
|
|
|
@ -17,7 +17,7 @@ aidl_interface {
|
|||
"android.hardware.common.fmq-V1",
|
||||
"android.hardware.camera.common-V1",
|
||||
"android.hardware.camera.metadata-V2",
|
||||
"android.hardware.graphics.common-V3",
|
||||
"android.hardware.graphics.common-V4",
|
||||
],
|
||||
backend: {
|
||||
cpp: {
|
||||
|
@ -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",
|
||||
],
|
||||
},
|
||||
],
|
||||
|
|
|
@ -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",
|
||||
],
|
||||
}
|
||||
|
||||
|
|
|
@ -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",
|
||||
],
|
||||
|
|
|
@ -36,7 +36,7 @@ aidl_interface {
|
|||
],
|
||||
stability: "vintf",
|
||||
imports: [
|
||||
"android.hardware.graphics.common-V3",
|
||||
"android.hardware.graphics.common-V4",
|
||||
"android.hardware.common-V2",
|
||||
],
|
||||
backend: {
|
||||
|
@ -57,7 +57,7 @@ aidl_interface {
|
|||
{
|
||||
version: "1",
|
||||
imports: [
|
||||
"android.hardware.graphics.common-V3",
|
||||
"android.hardware.graphics.common-V4",
|
||||
"android.hardware.common-V2",
|
||||
],
|
||||
},
|
||||
|
|
|
@ -47,7 +47,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"],
|
||||
|
|
|
@ -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",
|
||||
],
|
||||
},
|
||||
|
||||
|
|
Loading…
Reference in a new issue