Prepare for citadeld running by default.

Sanity checks for citadel are now in citadeld and are run by
/vendor/bin/hw/citadel_test. The old manual tests can be run by first
killing citadeld:

    kill $(pgrep citadeld) && test_citadel

Change-Id: I09b00617402643d68ae95b0f4ca879cf198ae05f

1 files changed, 11 insertions, 3 deletions

diff --git a/citadel/citadeld/Android.bp b/citadel/citadeld/Android.bp
index 3c6bb4b..2552454 100644
--- a/citadel/citadeld/Android.bp
+++ b/citadel/citadeld/Android.bp
@@ -20,6 +20,9 @@ cc_defaults {
         "aidl/android/hardware/citadel/ICitadeld.aidl",
     ],
     defaults: ["nos_base_cc_defaults"],
+    header_libs: [
+        "nos_headers",
+    ],
     shared_libs: [
         "libbase",
         "libbinder",
@@ -49,11 +52,13 @@ cc_binary {
     init_rc: ["citadeld.rc"],
     srcs: [
         "main.cpp",
+        "check.cpp",
     ],
     defaults: ["citadeld_defaults"],
     shared_libs: [
         "libnos",
         "libnos_client_citadel",
+        "libnos_transport",
     ],
 }
 
@@ -68,7 +73,10 @@ cc_library {
     aidl: {
         export_aidl_headers: true,
     },
-    header_libs: [
-        "nos_headers",
-    ],
+}
+
+cc_binary {
+    name: "citadel_test",
+    srcs: ["citadel_test.cpp"],
+    defaults: ["citadeld_defaults"],
 }