keystore2: Remove explicit dep on C DSOs
This was previously added as a hack to work around a build system bug in
which rlib dependencies would not result in their corresponding C DSOs
being installed on the device. Now that it is fixed, we can remove this.
Bug: 187412695
Test: m installclean && m; boot AVD
Change-Id: I61f14d7a60e80034d24f0e6e4c3a8e2ea8831c96
diff --git a/keystore2/Android.bp b/keystore2/Android.bp
index e8cdb6c..1c58672 100644
--- a/keystore2/Android.bp
+++ b/keystore2/Android.bp
@@ -149,28 +149,6 @@
// 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",
- "android.security.compat-ndk",
- "libc",
- "libdl_android",
- "libdl",
- "libkeymint",
- "libkeystore2_aaid",
- "libkeystore2_apc_compat",
- "libkeystore2_crypto",
- "libkm_compat_service",
- "libkm_compat",
- "libm",
- "libstatspull",
- "libstatssocket",
- ],
-
vintf_fragments: ["android.system.keystore2-service.xml"],
required: ["keystore_cli_v2"],