commit d8da1e45bf5f532d61dcf2c57cf2073601276f8c
author Max Bires <jbires@google.com> Wed Apr 21 16:14:55 2021 -0700
committer Max Bires <jbires@google.com> Wed Apr 21 16:16:20 2021 -0700
tree f6abd946951a0244c0945fc18222b542fca8e41f
parent b69da8fd122ece56065e6b77c1f7e787f39109f6

Changing cbor-java to static_libs

For some reason, cbor-java does not seem to be getting pulled into the
system image if it's only included as a shared library, so this commit
will patch over that until the root issue is found later by swapping it
over to a static lib.

Test: The network portion of the service works
Change-Id: I5b8055a9c4d45e68195cc25bbe906d565d59839d

Android.bp

diff --git a/Android.bp b/Android.bp
index 5f63517..2dbc7e2 100644
--- a/Android.bp
+++ b/Android.bp
@@ -25,11 +25,11 @@
     libs: [
         "android.system.keystore2-V1-java",
         "framework-annotations-lib",
-        "cbor-java",
     ],
     static_libs: [
         "android.hardware.security.keymint-V1-java",
         "android.security.remoteprovisioning-java",
+        "cbor-java",
     ],
     resource_dirs: ["res"],
     srcs: ["src/**/*.java"],