commit 0689e7e1627a56a6aef235c5d5ebeda18303e0e2
author Treehugger Robot <treehugger-gerrit@google.com> Tue Apr 05 09:05:52 2022 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Apr 05 09:05:52 2022 +0000
tree f50a5b4ccac99390a4acc80bc3386806e72160fc
parent f069ef1af0606adad9062eac2f3344d972c8fc81
parent c189c008dffe59844deac87a07dd99a712f5c4b9

Merge "Demote apkdmverity tests to postsubmit"

microdroid/Android.bp

diff --git a/microdroid/Android.bp b/microdroid/Android.bp
index b265d5c..4901351 100644
--- a/microdroid/Android.bp
+++ b/microdroid/Android.bp
@@ -88,11 +88,9 @@
         "microdroid_property_contexts",
         "microdroid_service_contexts",
 
-        // TODO(b/195425111) these four should be added automatically
-        "android.hardware.security.secureclock-V1-ndk",
-        "android.hardware.security.sharedsecret-V1-ndk",
-        "libcrypto",
-        "liblzma",
+        // TODO(b/195425111) these should be added automatically
+        "libcrypto", // used by many (init_second_stage, microdroid_manager, toybox, etc)
+        "liblzma", // used by init_second_stage
     ] + microdroid_shell_and_utilities,
     multilib: {
         common: {
@@ -111,9 +109,6 @@
                 "authfs_service",
                 "microdroid_manager",
                 "zipfuse",
-
-                // TODO(b/184872979): Needed by authfs. Remove once the Rust API is created.
-                "libbinder_rpc_unstable",
             ],
         },
     },
@@ -612,4 +607,4 @@
     src: "microdroid_event-log-tags",
     filename: "event-log-tags",
     installable: false,
-}
\ No newline at end of file
+}