Merge "Revert^2 "Move keymint to android.hardware.security."" am: 2a9b7d7f9e am: cd7aa3bdca am: 5de221ca99

Original change: https://android-review.googlesource.com/c/platform/build/+/1525183

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I95599575d9b237e44c3b6d02abec4cbdd2975bfe
This commit is contained in:
Treehugger Robot 2020-12-12 01:07:06 +00:00 committed by Automerger Merge Worker
commit 927af7eb0f

View file

@ -70,7 +70,6 @@ VNDK-core: android.hardware.graphics.bufferqueue@1.0.so
VNDK-core: android.hardware.graphics.bufferqueue@2.0.so
VNDK-core: android.hardware.identity-V2-ndk_platform.so
VNDK-core: android.hardware.keymaster-V2-ndk_platform.so
VNDK-core: android.hardware.keymint-V1-ndk_platform.so
VNDK-core: android.hardware.light-V1-ndk_platform.so
VNDK-core: android.hardware.media.bufferpool@2.0.so
VNDK-core: android.hardware.media.omx@1.0.so
@ -79,6 +78,7 @@ VNDK-core: android.hardware.memtrack@1.0.so
VNDK-core: android.hardware.power-V1-ndk_platform.so
VNDK-core: android.hardware.power.stats-V1-ndk_platform.so
VNDK-core: android.hardware.rebootescrow-V1-ndk_platform.so
VNDK-core: android.hardware.security.keymint-V1-ndk_platform.so
VNDK-core: android.hardware.soundtrigger@2.0-core.so
VNDK-core: android.hardware.soundtrigger@2.0.so
VNDK-core: android.hardware.vibrator-V1-ndk_platform.so