summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Treehugger Robot <treehugger-gerrit@google.com> 2020-10-21 00:52:13 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2020-10-21 00:52:13 +0000
commitc455ec4fbc1b95edd99232f4019a8252e387c67d (patch)
tree015a0503d7da4957a8b714b991af29b900fa4f5c
parent0eb5f6c9b35016b82c6fffca4062e5f6f99b740b (diff)
parent3695285a81ffc6d030461af136a76ded8b3f49be (diff)
Merge "Update VNDK version for common graphics HALs." am: 3695285a81
Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1465163 Change-Id: I8b6fda90f5855fd91409fcdcadfc8ab7a12664c9
-rw-r--r--libs/gralloc/types/Android.bp4
-rw-r--r--libs/ui/Android.bp4
-rw-r--r--services/surfaceflinger/tests/Android.bp2
3 files changed, 5 insertions, 5 deletions
diff --git a/libs/gralloc/types/Android.bp b/libs/gralloc/types/Android.bp
index 66fb295a19..cc31cd5f24 100644
--- a/libs/gralloc/types/Android.bp
+++ b/libs/gralloc/types/Android.bp
@@ -38,14 +38,14 @@ cc_library {
],
shared_libs: [
- "android.hardware.graphics.common-ndk_platform",
+ "android.hardware.graphics.common-unstable-ndk_platform",
"android.hardware.graphics.mapper@4.0",
"libhidlbase",
"liblog",
],
export_shared_lib_headers: [
- "android.hardware.graphics.common-ndk_platform",
+ "android.hardware.graphics.common-unstable-ndk_platform",
"android.hardware.graphics.mapper@4.0",
"libhidlbase",
],
diff --git a/libs/ui/Android.bp b/libs/ui/Android.bp
index 1ee8c7105c..47eb59fb0a 100644
--- a/libs/ui/Android.bp
+++ b/libs/ui/Android.bp
@@ -72,7 +72,7 @@ cc_library_shared {
"android.hardware.graphics.allocator@2.0",
"android.hardware.graphics.allocator@3.0",
"android.hardware.graphics.allocator@4.0",
- "android.hardware.graphics.common-ndk_platform",
+ "android.hardware.graphics.common-unstable-ndk_platform",
"android.hardware.graphics.common@1.2",
"android.hardware.graphics.mapper@2.0",
"android.hardware.graphics.mapper@2.1",
@@ -89,7 +89,7 @@ cc_library_shared {
export_shared_lib_headers: [
"android.hardware.graphics.common@1.2",
- "android.hardware.graphics.common-ndk_platform",
+ "android.hardware.graphics.common-unstable-ndk_platform",
"android.hardware.graphics.mapper@4.0",
"libgralloctypes",
],
diff --git a/services/surfaceflinger/tests/Android.bp b/services/surfaceflinger/tests/Android.bp
index fe2af80c98..1532855089 100644
--- a/services/surfaceflinger/tests/Android.bp
+++ b/services/surfaceflinger/tests/Android.bp
@@ -44,7 +44,7 @@ cc_test {
"libtrace_proto",
],
shared_libs: [
- "android.hardware.graphics.common-ndk_platform",
+ "android.hardware.graphics.common-unstable-ndk_platform",
"android.hardware.graphics.common@1.2",
"android.hardware.graphics.composer@2.1",
"libandroid",