*-ndk.so libraries are added to VndkMustUseVendorVariantList
We will replace the ndk_platform backend with the ndk backend. The
former hasn't been deleted yet because there already are references to
it. When the existing references are all replaced with the ndk backend,
we will remove the ndk_platform backend and the corresponding libraries
will be removed from this list.
Bug: 161456198
Test: m
Merged-In: I7c7aa1025a876e45fc4779378825d91098164e84
Change-Id: I7c7aa1025a876e45fc4779378825d91098164e84
(cherry picked from commit b58719c1567606a10d9af626bfe0cd1818ca1836)
diff --git a/cc/config/vndk.go b/cc/config/vndk.go
index 2894f89..e679133 100644
--- a/cc/config/vndk.go
+++ b/cc/config/vndk.go
@@ -19,52 +19,69 @@
// 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",
"android.hardware.authsecret-V1-ndk_platform",
- "android.hardware.automotive.occupant_awareness-ndk_platform",
+ "android.hardware.authsecret-ndk_platform",
+ "android.hardware.authsecret-unstable-ndk_platform",
+ "android.hardware.automotive.occupant_awareness-V1-ndk",
"android.hardware.automotive.occupant_awareness-V1-ndk_platform",
- "android.hardware.gnss-unstable-ndk_platform",
- "android.hardware.gnss-ndk_platform",
+ "android.hardware.automotive.occupant_awareness-ndk_platform",
+ "android.hardware.gnss-V1-ndk",
"android.hardware.gnss-V1-ndk_platform",
+ "android.hardware.gnss-ndk_platform",
+ "android.hardware.gnss-unstable-ndk_platform",
+ "android.hardware.health.storage-V1-ndk",
"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-V3-ndk",
"android.hardware.identity-V3-ndk_platform",
"android.hardware.identity-ndk_platform",
- "android.hardware.nfc@1.2",
+ "android.hardware.light-V1-ndk",
+ "android.hardware.light-V1-ndk_platform",
+ "android.hardware.light-ndk_platform",
+ "android.hardware.memtrack-V1-ndk",
"android.hardware.memtrack-V1-ndk_platform",
"android.hardware.memtrack-ndk_platform",
"android.hardware.memtrack-unstable-ndk_platform",
+ "android.hardware.nfc@1.2",
+ "android.hardware.oemlock-V1-ndk",
"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-V2-ndk",
"android.hardware.power-V2-ndk_platform",
"android.hardware.power-ndk_platform",
+ "android.hardware.power.stats-V1-ndk",
"android.hardware.power.stats-V1-ndk_platform",
"android.hardware.power.stats-ndk_platform",
"android.hardware.power.stats-unstable-ndk_platform",
+ "android.hardware.rebootescrow-V1-ndk",
"android.hardware.rebootescrow-V1-ndk_platform",
"android.hardware.rebootescrow-ndk_platform",
+ "android.hardware.security.keymint-V1-ndk",
"android.hardware.security.keymint-V1-ndk_platform",
"android.hardware.security.keymint-ndk_platform",
"android.hardware.security.keymint-unstable-ndk_platform",
+ "android.hardware.security.secureclock-V1-ndk",
"android.hardware.security.secureclock-V1-ndk_platform",
- "android.hardware.security.secureclock-unstable-ndk_platform",
"android.hardware.security.secureclock-ndk_platform",
+ "android.hardware.security.secureclock-unstable-ndk_platform",
+ "android.hardware.security.sharedsecret-V1-ndk",
"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-V2-ndk",
"android.hardware.vibrator-V2-ndk_platform",
"android.hardware.vibrator-ndk_platform",
+ "android.hardware.weaver-V1-ndk",
"android.hardware.weaver-V1-ndk_platform",
"android.hardware.weaver-ndk_platform",
"android.hardware.weaver-unstable-ndk_platform",
+ "android.system.keystore2-V1-ndk",
"android.system.keystore2-V1-ndk_platform",
"android.system.keystore2-ndk_platform",
"android.system.keystore2-unstable-ndk_platform",
