Merge "Allow Keystore to use the der crate" into main am: 21b7ef03e4 am: 1d7cf81fe2
Original change: https://android-review.googlesource.com/c/platform/external/rust/android-crates-io/+/3367137
Change-Id: I2444ea2fb2e9ac1c2b015f8bdd903a5db21e9712
Signed-off-by: Automerger Merge Worker <[email protected]>
diff --git a/crates/der/Android.bp b/crates/der/Android.bp
index 5fd56a2..8259923 100644
--- a/crates/der/Android.bp
+++ b/crates/der/Android.bp
@@ -48,6 +48,7 @@
"//external/rust/android-crates-io/crates/x509-cert:__subpackages__",
"//packages/modules/Virtualization:__subpackages__",
"//system/keymint:__subpackages__",
+ "//system/security/keystore2:__subpackages__",
],
}
diff --git a/crates/der/cargo_embargo.json b/crates/der/cargo_embargo.json
index 50ad25c..98d1415 100644
--- a/crates/der/cargo_embargo.json
+++ b/crates/der/cargo_embargo.json
@@ -18,7 +18,8 @@
"//external/rust/android-crates-io/crates/pkcs8:__subpackages__",
"//external/rust/android-crates-io/crates/x509-cert:__subpackages__",
"//packages/modules/Virtualization:__subpackages__",
- "//system/keymint:__subpackages__"
+ "//system/keymint:__subpackages__",
+ "//system/security/keystore2:__subpackages__"
],
"libder_nostd": [
"//external/rust/android-crates-io/crates/sec1:__subpackages__",
