incidentd can now handle multiple callers asking it for incident reports
Test: bit incident_test:* GtsIncidentManagerTestCases:*
Bug: 123543706
Change-Id: I9f671dd5d8b2ad139f952a23e575c2be16120459
diff --git a/cmds/incidentd/Android.bp b/cmds/incidentd/Android.bp
index 3dc1093..8ac11df 100644
--- a/cmds/incidentd/Android.bp
+++ b/cmds/incidentd/Android.bp
@@ -21,6 +21,7 @@
srcs: [
"src/**/*.cpp",
+ "src/**/*.proto",
":incidentd_section_list",
],
@@ -43,6 +44,10 @@
local_include_dirs: ["src"],
generated_headers: ["gen-platform-proto-constants"],
+ proto: {
+ type: "lite",
+ },
+
shared_libs: [
"libbase",
"libbinder",
@@ -56,6 +61,11 @@
"libprotobuf-cpp-lite",
],
+ static_libs: [
+ "libincidentcompanion",
+ "libplatformprotos",
+ ],
+
init_rc: ["incidentd.rc"],
}
@@ -72,6 +82,7 @@
"-Wall",
"-Wno-unused-variable",
"-Wunused-parameter",
+ "-g",
// Allow implicit fallthrough in IncidentService.cpp:85 until it is fixed.
"-Wno-error=implicit-fallthrough",
@@ -82,21 +93,26 @@
srcs: [
"tests/**/*.cpp",
- "src/PrivacyBuffer.cpp",
+ "tests/**/*.proto",
"src/FdBuffer.cpp",
"src/Privacy.cpp",
+ "src/PrivacyFilter.cpp",
"src/Reporter.cpp",
"src/Section.cpp",
"src/Throttler.cpp",
+ "src/WorkDirectory.cpp",
"src/incidentd_util.cpp",
+ "src/proto_util.cpp",
"src/report_directory.cpp",
+ "src/**/*.proto",
],
data: ["testdata/**/*"],
static_libs: [
"libgmock",
- "libplatformprotos",
+ "libincidentcompanion",
+ "libplatformprotos-test",
],
shared_libs: [
"libbase",
@@ -105,11 +121,19 @@
"libdumputils",
"libincident",
"liblog",
- "libprotobuf-cpp-lite",
+ "libprotobuf-cpp-full",
"libprotoutil",
"libservices",
"libutils",
],
+
+ target: {
+ android: {
+ proto: {
+ type: "full",
+ },
+ },
+ },
}
genrule {