incidentd can now handle multiple callers asking it for incident reports

Test: bit incident_test:* GtsIncidentManagerTestCases:*
Bug: 123543706
Change-Id: I9f671dd5d8b2ad139f952a23e575c2be16120459
diff --git a/libs/incident/Android.bp b/libs/incident/Android.bp
index 905e303..150f6dc 100644
--- a/libs/incident/Android.bp
+++ b/libs/incident/Android.bp
@@ -27,23 +27,29 @@
         "libbinder",
         "liblog",
         "libutils",
+        "libprotobuf-cpp-lite",
+    ],
+
+    static_libs: [
+        "libplatformprotos",
+    ],
+
+    whole_static_libs: [
+        "libincidentcompanion",
     ],
 
     aidl: {
-        include_dirs: ["frameworks/base/core/java"],
+        include_dirs: [
+            "frameworks/base/core/java",
+            "frameworks/native/libs/incidentcompanion/binder",
+        ],
         export_aidl_headers: true,
     },
 
     srcs: [
         ":libincident_aidl",
-        "proto/android/os/metadata.proto",
         "src/IncidentReportArgs.cpp",
     ],
 
-    proto: {
-        type: "lite",
-        export_proto_headers: true,
-    },
-
     export_include_dirs: ["include"],
-}
\ No newline at end of file
+}