commit 1b1a79c68ff41522974c4d7523bd6ec65d5313d5
author Treehugger Robot <treehugger-gerrit@google.com> Thu Feb 03 00:00:31 2022 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Feb 03 00:00:31 2022 +0000
tree 89ae9746afb544aa5db5e0bbbc253fb2547bf408
parent 2f31252e4c1f6f1ede8e898f80ca2ea18bcee215
parent 9bdc4301b64d6164cb1a6f1cf89dc48429272777

Merge "Keystore 2.0: Sort watch dog records."

keystore2/Android.bp

diff --git a/keystore2/Android.bp b/keystore2/Android.bp
index c383f4f..2027af4 100644
--- a/keystore2/Android.bp
+++ b/keystore2/Android.bp
@@ -76,15 +76,6 @@
 }
 
 rust_library {
-    name: "libkeystore2_noicu",
-    defaults: ["libkeystore2_defaults"],
-    rustlibs: [
-        "liblibsqlite3_sys_noicu",
-        "librusqlite_noicu",
-    ],
-}
-
-rust_library {
     name: "libkeystore2_test_utils",
     crate_name: "keystore2_test_utils",
     srcs: ["test_utils/lib.rs"],

keystore2/legacykeystore/Android.bp

diff --git a/keystore2/legacykeystore/Android.bp b/keystore2/legacykeystore/Android.bp
index d407569..505b165 100644
--- a/keystore2/legacykeystore/Android.bp
+++ b/keystore2/legacykeystore/Android.bp
@@ -47,15 +47,6 @@
     ],
 }
 
-rust_library {
-    name: "liblegacykeystore-rust_noicu",
-    defaults: ["liblegacykeystore-rust_defaults"],
-    rustlibs: [
-        "libkeystore2_noicu",
-        "librusqlite_noicu",
-    ],
-}
-
 rust_test {
     name: "legacykeystore_test",
     crate_name: "legacykeystore",