keystore2: Statically link Rust libs to save RAM
While dynamic linkage scales better, `keystore2` is the only process
currently using dynamic Rust libraries in S. Given this, it makes more
sense to statically link its dependencies to save RAM for now.
This shaves about 4.1M RSS from a running `keystore2` at time of
writing.
Test: m, boot, showmap on keystore2
Bug: 186601681
Bug: 183785247
Change-Id: I0684a8959ab136432e6a932dddafe2a765ad0c8c
diff --git a/keystore2/Android.bp b/keystore2/Android.bp
index 8d0f4e7..6386201 100644
--- a/keystore2/Android.bp
+++ b/keystore2/Android.bp
@@ -76,7 +76,7 @@
rustlibs: [
"liblog_rust",
"librand",
- ]
+ ],
}
rust_test {
@@ -105,5 +105,37 @@
],
init_rc: ["keystore2.rc"],
+ // In S, keystore2 is the only process using dynamically linked Rust from
+ // /system. As a result, the usual savings from sharing libraries don't
+ // apply.
+ // Remove `prefer_rlib: true` once we have several processes, once a space
+ // calculation shows net RAM savings, or once we have automatic variant
+ // selection available in the build system.
+ prefer_rlib: true,
+
+ // TODO(b/187412695)
+ // This is a hack to work around the build system not installing
+ // dynamic dependencies of rlibs to the device. This section should
+ // be removed once that works correctly.
+ shared_libs: [
+ "android.hardware.confirmationui@1.0",
+ "android.hardware.security.sharedsecret-V1-ndk_platform",
+ "android.security.compat-ndk_platform",
+ "libc",
+ "libdl_android",
+ "libdl",
+ "libandroidicu",
+ "libkeymint",
+ "libkeystore2_aaid",
+ "libkeystore2_apc_compat",
+ "libkeystore2_crypto",
+ "libkeystore2_vintf_cpp",
+ "libkm_compat_service",
+ "libkm_compat",
+ "libm",
+ "libstatspull",
+ "libstatssocket",
+ ],
+
vintf_fragments: ["android.system.keystore2-service.xml"],
}
