[conflict] Merge "Update KeyMint dependency to v3" am: 837ff7ab66 am: 8adafcece2 am: 08e900bbfb
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2320055 Change-Id: I643a68282d5d4bce2a3cf606df87cb6f7d9c78ce Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -100,7 +100,7 @@ filegroup {
|
||||
":android.hardware.gnss-V2-java-source",
|
||||
":android.hardware.graphics.common-V3-java-source",
|
||||
":android.hardware.keymaster-V4-java-source",
|
||||
":android.hardware.security.keymint-V2-java-source",
|
||||
":android.hardware.security.keymint-V3-java-source",
|
||||
":android.hardware.security.secureclock-V1-java-source",
|
||||
":android.hardware.tv.tuner-V1-java-source",
|
||||
":android.security.apc-java-source",
|
||||
|
||||
Reference in New Issue
Block a user