Switch traceconv and trace_processor_shell to use libsqlite_static_noicu
The 'libsqlite' library for host recently switched on the
SQLITE_ENABLE_ICU flag, which now requires ICU libraries to be included
in binaries that link libsqlite statically. Because traceconv and
trace_processor_shell do not need the ICU extensions, switch to using
the 'libsqlite_static_noicu' target.
Test: m traceconv
Test: m trace_processor_shell
Bug: 308173442
Change-Id: Id2d26238ea96e31d1addfd0a99cbac69ee55c1e2
diff --git a/Android.bp b/Android.bp
index bf201a2..3b2c60d 100644
--- a/Android.bp
+++ b/Android.bp
@@ -14446,7 +14446,7 @@
host: {
static_libs: [
"libprotobuf-cpp-full",
- "libsqlite",
+ "libsqlite_static_noicu",
"libz",
"sqlite_ext_percentile",
],
@@ -14598,7 +14598,7 @@
":perfetto_src_traceconv_utils",
],
static_libs: [
- "libsqlite",
+ "libsqlite_static_noicu",
"libz",
"perfetto_src_trace_processor_demangle",
"sqlite_ext_percentile",
