Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 43b2c668 authored by Jooyung Han's avatar Jooyung Han
Browse files

Remove AIDL modules from VndkMustUseVendorVariantList 

Vendor variants of AIDL-gen CC modules are by default different from
core variants. So instead of adding them manually to the list, AIDL
builder can mark them as MustUseVendorVariant.

Bug: 233616647
Test: m
Merged-In: Ifca0eb64d60ecb49d72cd0347336b69fb332c58c
Change-Id: Ifca0eb64d60ecb49d72cd0347336b69fb332c58c
parent 78ce8c23

cc/config/vndk.go

+1 −92
Original line number Diff line number Diff line
@@ -17,100 +17,9 @@ 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

// Note that AIDL-generated modules must use vendor variants by default.

var VndkMustUseVendorVariantList = []string{

	"android.hardware.authsecret-V1-ndk",

	"android.hardware.authsecret-V1-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.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-V1-ndk",

	"android.hardware.health-ndk",

	"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.identity-V2-ndk_platform",

	"android.hardware.identity-V3-ndk",

	"android.hardware.identity-V3-ndk_platform",

	"android.hardware.identity-ndk_platform",

	"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.radio-V1-ndk",

	"android.hardware.radio-V1-ndk_platform",

	"android.hardware.radio.config-V1-ndk",

	"android.hardware.radio.config-V1-ndk_platform",

	"android.hardware.radio.data-V1-ndk",

	"android.hardware.radio.data-V1-ndk_platform",

	"android.hardware.radio.messaging-V1-ndk",

	"android.hardware.radio.messaging-V1-ndk_platform",

	"android.hardware.radio.modem-V1-ndk",

	"android.hardware.radio.modem-V1-ndk_platform",

	"android.hardware.radio.network-V1-ndk",

	"android.hardware.radio.network-V1-ndk_platform",

	"android.hardware.radio.sim-V1-ndk",

	"android.hardware.radio.sim-V1-ndk_platform",

	"android.hardware.radio.voice-V1-ndk",

	"android.hardware.radio.voice-V1-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-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.suspend-V1-ndk",

	"android.system.keystore2-V1-ndk",

	"android.se.omapi-V1-ndk_platform",

	"android.se.omapi-ndk_platform",

	"android.se.omapi-unstable-ndk_platform",

	"android.hardware.wifi.hostapd-V1-ndk",

	"android.hardware.wifi.hostapd-V1-ndk_platform",

	"android.hardware.wifi.supplicant-V1-ndk",

	"android.system.keystore2-V1-ndk_platform",

	"android.system.keystore2-ndk_platform",

	"android.system.keystore2-unstable-ndk_platform",

	"android.system.suspend-V1-ndk_platform",

	"libbinder",

	"libcrypto",

	"libexpat",