From 57272380ffc7cebef1e3e4bc3d1c38fafd71f7d5 Mon Sep 17 00:00:00 2001 From: Jeongik Cha Date: Tue, 26 Jan 2021 10:20:49 +0900 Subject: [PATCH] Update VndkMustUseVendorVariantList As AIDL version rule is changed, change VNDK list accordingly. 'unstable' and non-versioned aidl module will be cleaned up Bug: 150578172 Test: m Change-Id: I3e82b2c01f1fca75ac97985053b4a5826d151340 Merged-In: I3e82b2c01f1fca75ac97985053b4a5826d151340 --- cc/config/vndk.go | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/cc/config/vndk.go b/cc/config/vndk.go index 107ae7dde..45c18c2f4 100644 --- a/cc/config/vndk.go +++ b/cc/config/vndk.go @@ -17,25 +17,47 @@ package config // List of VNDK libraries that have different core variant and vendor variant. // For these libraries, the vendor variants must be installed even if the device // has VndkUseCoreVariant set. +// TODO(b/150578172): clean up unstable and non-versioned aidl module var VndkMustUseVendorVariantList = []string{ "android.hardware.authsecret-unstable-ndk_platform", + "android.hardware.authsecret-ndk_platform", + "android.hardware.authsecret-V1-ndk_platform", "android.hardware.automotive.occupant_awareness-ndk_platform", + "android.hardware.automotive.occupant_awareness-V1-ndk_platform", + "android.hardware.health.storage-V1-ndk_platform", "android.hardware.health.storage-ndk_platform", "android.hardware.health.storage-unstable-ndk_platform", + "android.hardware.light-V1-ndk_platform", "android.hardware.light-ndk_platform", + "android.hardware.identity-V2-ndk_platform", "android.hardware.identity-ndk_platform", "android.hardware.nfc@1.2", + "android.hardware.memtrack-V1-ndk_platform", + "android.hardware.memtrack-ndk_platform", "android.hardware.memtrack-unstable-ndk_platform", + "android.hardware.oemlock-V1-ndk_platform", + "android.hardware.oemlock-ndk_platform", "android.hardware.oemlock-unstable-ndk_platform", + "android.hardware.power-V1-ndk_platform", "android.hardware.power-ndk_platform", + "android.hardware.rebootescrow-V1-ndk_platform", "android.hardware.rebootescrow-ndk_platform", + "android.hardware.security.keymint-V1-ndk_platform", + "android.hardware.security.keymint-ndk_platform", "android.hardware.security.keymint-unstable-ndk_platform", - "android.hardware.security.secureclock-ndk_platform", + "android.hardware.security.secureclock-V1-ndk_platform", "android.hardware.security.secureclock-unstable-ndk_platform", + "android.hardware.security.secureclock-ndk_platform", + "android.hardware.security.sharedsecret-V1-ndk_platform", "android.hardware.security.sharedsecret-ndk_platform", "android.hardware.security.sharedsecret-unstable-ndk_platform", + "android.hardware.vibrator-V1-ndk_platform", "android.hardware.vibrator-ndk_platform", + "android.hardware.weaver-V1-ndk_platform", + "android.hardware.weaver-ndk_platform", "android.hardware.weaver-unstable-ndk_platform", + "android.system.keystore2-V1-ndk_platform", + "android.system.keystore2-ndk_platform", "android.system.keystore2-unstable-ndk_platform", "libbinder", "libcrypto",