commit d4676319198061e8cb180e97028db5cfe667d998
author Treehugger Robot <treehugger-gerrit@google.com> Mon Sep 27 01:53:16 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Sep 27 01:53:16 2021 +0000
tree 3c3de608a6d14df8b3c30b630f733bd4ebe44cfd
parent a3400c0cfa6eede12c1a18fdba049dd5f0ac5be2
parent bdb6ea2e7d6fd679854896084e46b1189357056d

Merge "Use sqlite with no ICU support"

keystore2/Android.bp

diff --git a/keystore2/Android.bp b/keystore2/Android.bp
index 7c4f61b..7f1d15d 100644
--- a/keystore2/Android.bp
+++ b/keystore2/Android.bp
@@ -48,11 +48,11 @@
         "libkeystore2_vintf_rust",
         "liblazy_static",
         "liblibc",
-        "liblibsqlite3_sys",
+        "liblibsqlite3_sys_noicu",
         "liblog_event_list",
         "liblog_rust",
         "librand",
-        "librusqlite",
+        "librusqlite_noicu",
         "librustutils",
         "libthiserror",
     ],
@@ -153,7 +153,6 @@
         "libc",
         "libdl_android",
         "libdl",
-        "libandroidicu",
         "libkeymint",
         "libkeystore2_aaid",
         "libkeystore2_apc_compat",

keystore2/legacykeystore/Android.bp

diff --git a/keystore2/legacykeystore/Android.bp b/keystore2/legacykeystore/Android.bp
index da6aa8a..62d593c 100644
--- a/keystore2/legacykeystore/Android.bp
+++ b/keystore2/legacykeystore/Android.bp
@@ -33,7 +33,7 @@
         "libbinder_rs",
         "libkeystore2",
         "liblog_rust",
-        "librusqlite",
+        "librusqlite_noicu",
         "librustutils",
         "libthiserror",
     ],
@@ -52,7 +52,7 @@
         "libkeystore2",
         "libkeystore2_test_utils",
         "liblog_rust",
-        "librusqlite",
+        "librusqlite_noicu",
         "librustutils",
         "libthiserror",
     ],