commit bdb6ea2e7d6fd679854896084e46b1189357056d
author Jiyong Park <jiyong@google.com> Mon Sep 13 17:08:15 2021 +0900
committer Jiyong Park <jiyong@google.com> Mon Sep 13 17:21:10 2021 +0900
tree ef0acb36f3ded7e9d6b08cd7eef48f194ef9ab3d
parent d3e248434f1e3ffbf7221d48fbf4d2ed01c58361

Use sqlite with no ICU support

keystore has used libsqlite which was built with the ICU extension [1].
The extension brings huge (> 60MB) dependency to the i18n APEX which is
too big for microdroid. Since the use of sqlite in keystore doesn't
seem to require operations like upper/lower, sorting, and regex for all
unicode strings, drop the dependency to the i18n APEX.

[1] https://www.sqlite.org/src/file?name=ext/icu/README.txt

Bug: 199674764
Test: m
Change-Id: I1e7a83283c3e79e69793a2076c97bc1bf6b9e0bf

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",
     ],