diff options
| author | Sally Qi <sallyqi@google.com> | 2023-07-17 11:31:41 +0800 |
|---|---|---|
| committer | Sally Qi <sallyqi@google.com> | 2023-07-18 14:45:29 +0000 |
| commit | 6cde8c106ee95636e9b0fa1d9050d55db1398d06 (patch) | |
| tree | 0e011e67e515c0c15e587938036d5f447bd87172 | |
| parent | f4e27814d8f0bb0389c45dd1e66c7d57dff35c2e (diff) | |
| download | gchips-6cde8c106ee95636e9b0fa1d9050d55db1398d06.tar.gz | |
Use android.hardware.graphics.common wrap.
Bug: 291745893
Test: builds
Change-Id: If8b08b67d6a5ab0b4044f844f960f3659401c397
| -rw-r--r-- | gralloc4/interfaces/libs/drmutils/Android.bp | 2 | ||||
| -rw-r--r-- | gralloc4/src/Android.bp | 2 | ||||
| -rw-r--r-- | gralloc4/src/allocator/Android.bp | 2 | ||||
| -rw-r--r-- | gralloc4/src/capabilities/Android.bp | 2 | ||||
| -rw-r--r-- | gralloc4/src/core/Android.bp | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/gralloc4/interfaces/libs/drmutils/Android.bp b/gralloc4/interfaces/libs/drmutils/Android.bp index 82ba768..cff9a7e 100644 --- a/gralloc4/interfaces/libs/drmutils/Android.bp +++ b/gralloc4/interfaces/libs/drmutils/Android.bp @@ -21,6 +21,7 @@ package { cc_library_static { name: "libgralloc_drmutils", + defaults: ["android.hardware.graphics.common-ndk_shared"], cflags: [ "-Wall", "-Werror", @@ -33,7 +34,6 @@ cc_library_static { "liblog", "libdrm", "libcutils", - "android.hardware.graphics.common-V4-ndk", ], header_libs: [ "libgralloc_headers", diff --git a/gralloc4/src/Android.bp b/gralloc4/src/Android.bp index a813fc8..ecd2fbd 100644 --- a/gralloc4/src/Android.bp +++ b/gralloc4/src/Android.bp @@ -40,6 +40,7 @@ cc_library_shared { vendor: true, defaults: [ "arm_gralloc_defaults", + "android.hardware.graphics.common-ndk_shared", ], srcs: [ "libGralloc4Wrapper/wrapper.cpp", @@ -69,7 +70,6 @@ cc_library_shared { "libhidltransport", "libnativewindow", "android.hardware.graphics.common@1.2", - "android.hardware.graphics.common-V4-ndk", "android.hardware.graphics.mapper@4.0", "libdmabufheap", "libgralloctypes", diff --git a/gralloc4/src/allocator/Android.bp b/gralloc4/src/allocator/Android.bp index fe42411..5ff23f8 100644 --- a/gralloc4/src/allocator/Android.bp +++ b/gralloc4/src/allocator/Android.bp @@ -51,6 +51,7 @@ arm_gralloc_allocator_cc_defaults { name: "arm_gralloc_allocator_defaults", defaults: [ "arm_gralloc_defaults", + "android.hardware.graphics.common-ndk_shared", ], soong_config_variables: { gralloc_use_ion_dma_heap: { @@ -89,7 +90,6 @@ arm_gralloc_allocator_cc_defaults { "libsync", "libutils", "libnativewindow", - "android.hardware.graphics.common-V4-ndk", ], header_libs: [ "libnativebase_headers", diff --git a/gralloc4/src/capabilities/Android.bp b/gralloc4/src/capabilities/Android.bp index 2b25811..46d3376 100644 --- a/gralloc4/src/capabilities/Android.bp +++ b/gralloc4/src/capabilities/Android.bp @@ -67,6 +67,7 @@ arm_gralloc_capabilities_cc_defaults { name: "arm_gralloc_capabilities_defaults", defaults: [ "arm_gralloc_defaults", + "android.hardware.graphics.common-ndk_shared", ], soong_config_variables: { mali_gpu_support_afbc_basic: { @@ -119,7 +120,6 @@ arm_gralloc_capabilities_cc_defaults { "libcutils", "libsync", "libutils", - "android.hardware.graphics.common-V4-ndk", ], } diff --git a/gralloc4/src/core/Android.bp b/gralloc4/src/core/Android.bp index b2e5ca3..a6ee46e 100644 --- a/gralloc4/src/core/Android.bp +++ b/gralloc4/src/core/Android.bp @@ -39,6 +39,7 @@ arm_gralloc_core_cc_defaults { name: "arm_gralloc_core_defaults", defaults: [ "arm_gralloc_defaults", + "android.hardware.graphics.common-ndk_shared", ], soong_config_variables: { gralloc_ion_sync_on_lock: { @@ -69,7 +70,6 @@ arm_gralloc_core_cc_defaults { "libcutils", "libutils", "android.hardware.graphics.common@1.2", - "android.hardware.graphics.common-V4-ndk", ], target: { android: { |