From 67f5d0f838bcdfe785c3c4c231f3f81e1157173b Mon Sep 17 00:00:00 2001 From: Steven Moreland Date: Fri, 16 Oct 2020 23:39:53 +0000 Subject: [PATCH] Update VNDK version for common graphics HALs. We are adding things to them, and in order for core libraries like libui to use them, the newer versions need to be in the VNDK. Bug: 170435409 Test: build Change-Id: I4094240656f357b5ae52194befd0e10627b9fe23 Merged-In: I4094240656f357b5ae52194befd0e10627b9fe23 --- common/aidl/Android.bp | 1 + graphics/common/aidl/Android.bp | 1 + graphics/mapper/4.0/vts/functional/Android.bp | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/common/aidl/Android.bp b/common/aidl/Android.bp index 9ea4cdf5c1..0f0fa82cfc 100644 --- a/common/aidl/Android.bp +++ b/common/aidl/Android.bp @@ -6,6 +6,7 @@ aidl_interface { enabled: true, support_system_process: true, }, + vndk_use_version: "2", srcs: [ "android/hardware/common/*.aidl", ], diff --git a/graphics/common/aidl/Android.bp b/graphics/common/aidl/Android.bp index e5942339e7..22e609d758 100644 --- a/graphics/common/aidl/Android.bp +++ b/graphics/common/aidl/Android.bp @@ -6,6 +6,7 @@ aidl_interface { enabled: true, support_system_process: true, }, + vndk_use_version: "2", srcs: [ "android/hardware/graphics/common/*.aidl", ], diff --git a/graphics/mapper/4.0/vts/functional/Android.bp b/graphics/mapper/4.0/vts/functional/Android.bp index 03abc891c0..8bda42556b 100644 --- a/graphics/mapper/4.0/vts/functional/Android.bp +++ b/graphics/mapper/4.0/vts/functional/Android.bp @@ -19,7 +19,7 @@ cc_test { defaults: ["VtsHalTargetTestDefaults"], srcs: ["VtsHalGraphicsMapperV4_0TargetTest.cpp"], static_libs: [ - "android.hardware.graphics.common-ndk_platform", + "android.hardware.graphics.common-unstable-ndk_platform", "android.hardware.graphics.mapper@4.0-vts", "libgralloctypes", "libsync",