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

Commit f1b0e825 authored by Jeongik Cha's avatar Jeongik Cha Committed by Gerrit Code Review
Browse files

Merge changes from topic "b/150578172" 

* changes:
  Update VndkMustUseVendorVariantList
  update apex allowed deps
parents 700730e6 57272380

apex/allowed_deps.txt

+2 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ android.hardware.cas.native@1.0(minSdkVersion:29) 
android.hardware.cas@1.0(minSdkVersion:29)

android.hardware.common-ndk_platform(minSdkVersion:29)

android.hardware.common-unstable-ndk_platform(minSdkVersion:29)

android.hardware.common-V2-ndk_platform(minSdkVersion:29)

android.hardware.graphics.allocator@2.0(minSdkVersion:29)

android.hardware.graphics.allocator@3.0(minSdkVersion:29)

android.hardware.graphics.allocator@4.0(minSdkVersion:29)
@@ -194,6 +195,7 @@ InProcessTethering(minSdkVersion:30) 
InProcessTethering(minSdkVersion:current)

ipmemorystore-aidl-interfaces-java(minSdkVersion:29)

ipmemorystore-aidl-interfaces-unstable-java(minSdkVersion:29)

ipmemorystore-aidl-interfaces-V11-java(minSdkVersion:29)

jni_headers(minSdkVersion:29)

jsr305(minSdkVersion:14)

kotlinx-coroutines-android(minSdkVersion:current)

cc/config/vndk.go

+23 −1
Original line number Diff line number Diff line
@@ -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",