incidentd can now handle multiple callers asking it for incident reports
Test: bit incident_test:* GtsIncidentManagerTestCases:*
Bug: 123543706
Change-Id: I9f671dd5d8b2ad139f952a23e575c2be16120459
diff --git a/Android.bp b/Android.bp
index 8a3f76c..b9b1bd8 100644
--- a/Android.bp
+++ b/Android.bp
@@ -721,6 +721,7 @@
"frameworks/av/camera/aidl",
"frameworks/av/media/libaudioclient/aidl",
"frameworks/native/aidl/gui",
+ "frameworks/native/libs/incidentcompanion/binder",
"system/core/storaged/binder",
"system/vold/binder",
"system/gsid/aidl",
@@ -968,7 +969,10 @@
output_params: ["store_unknown_fields=true"],
include_dirs: ["external/protobuf/src"],
},
-
+ exclude_srcs: [
+ "core/proto/android/privacy.proto",
+ "core/proto/android/section.proto",
+ ],
sdk_version: "current",
srcs: [
"core/proto/**/*.proto",
@@ -988,6 +992,10 @@
"core/proto/**/*.proto",
"libs/incident/proto/android/os/**/*.proto",
],
+ exclude_srcs: [
+ "core/proto/android/privacy.proto",
+ "core/proto/android/section.proto",
+ ],
// Protos have lots of MissingOverride and similar.
errorprone: {
javacflags: ["-XepDisableAllChecks"],
@@ -995,9 +1003,9 @@
}
// ==== c++ proto device library ==============================
-cc_library {
- name: "libplatformprotos",
- host_supported: true,
+cc_defaults {
+ name: "libplatformprotos-defaults",
+
proto: {
export_proto_headers: true,
include_dirs: ["external/protobuf/src"],
@@ -1011,8 +1019,13 @@
srcs: [
"core/proto/**/*.proto",
- "libs/incident/**/*.proto",
],
+}
+
+cc_library {
+ name: "libplatformprotos",
+ defaults: ["libplatformprotos-defaults"],
+ host_supported: true,
target: {
host: {
@@ -1024,6 +1037,9 @@
proto: {
type: "lite",
},
+ shared_libs: [
+ "libprotobuf-cpp-lite",
+ ],
shared: {
enabled: false,
},
@@ -1031,6 +1047,26 @@
},
}
+// This is the full proto version of libplatformprotos. It may only
+// be used by test code that is not shipped on the device.
+cc_library {
+ name: "libplatformprotos-test",
+ defaults: ["libplatformprotos-defaults"],
+ host_supported: false,
+
+ target: {
+ android: {
+ proto: {
+ type: "full",
+ },
+ shared: {
+ enabled: false,
+ },
+ },
+ },
+}
+
+
gensrcs {
name: "gen-platform-proto-constants",
depfile: true,
@@ -1068,6 +1104,7 @@
output_extension: "proto.h",
}
+
subdirs = [
"cmds/*",
"core/*",