Use tinyxml2-based generated Apex Info List sources
We can reduce the size of odrefresh and runtime binaries by switching from
libxml2 to libtinyxml2. The dependency comes from the usage of the Apex Info
List.
Since the xsdc tool has been updated to have a new option, -t/--tinyxml, which
generates the source files that use the libtinyxml2 API, we should use this
feature to gain the binary size advantage.
Size of odrefresh when using libxml2: 444752
Size of odrefresh when using libtinyxml2: 137724
Bug: 177209057
Test: m
Change-Id: I5c92d44f9ccbe94507a2dd8653814451ed10c645
diff --git a/odrefresh/Android.bp b/odrefresh/Android.bp
index 10845c5..b5a5eb3 100644
--- a/odrefresh/Android.bp
+++ b/odrefresh/Android.bp
@@ -36,7 +36,7 @@
local_include_dirs: ["include"],
header_libs: ["dexoptanalyzer_headers"],
generated_sources: [
- "apex-info-list",
+ "apex-info-list-tinyxml",
"art-apex-cache-info",
"art-odrefresh-operator-srcs",
],
@@ -46,19 +46,12 @@
"libdexfile",
"liblog",
],
- static_libs: ["libxml2"],
+ static_libs: ["libtinyxml2"],
target: {
android: {
// Use the 32-bit version of odrefresh on devices.
compile_multilib: "prefer32",
},
- host: {
- shared_libs: [
- // Both these libraries for libxml2 on host for code derived from apex-info-list.
- "libicui18n",
- "libicuuc",
- ],
- },
},
tidy: true,
tidy_flags: [
@@ -203,4 +196,5 @@
package_name: "com.android.art",
api_dir: "schema",
gen_writer: true,
+ tinyxml: true,
}
diff --git a/runtime/Android.bp b/runtime/Android.bp
index c85d75a..b64b3f4 100644
--- a/runtime/Android.bp
+++ b/runtime/Android.bp
@@ -387,10 +387,10 @@
],
static_libs: [
"libstatslog_art",
- "libxml2",
+ "libtinyxml2",
],
generated_sources: [
- "apex-info-list",
+ "apex-info-list-tinyxml",
],
},
android_arm: {
