Create a new ConfiguredTarget message in the analysis proto and add the checksum representation of BuildConfigurations to the Configuration message.

PiperOrigin-RevId: 191447098

2 files changed, 39 insertions, 1 deletions

diff --git a/src/main/protobuf/BUILD b/src/main/protobuf/BUILD
index 3ed9d1f541..5db4c8504f 100644
--- a/src/main/protobuf/BUILD
+++ b/src/main/protobuf/BUILD
@@ -14,7 +14,6 @@ exports_files(
 
 FILES = [
     "action_cache",
-    "analysis",
     "android_deploy_info",
     "bazel_flags",
     "build",
@@ -47,6 +46,22 @@ FILES = [
     deps = [":" + s + "_java_proto"],
 ) for s in FILES]
 
+proto_library(
+    name = "analysis_proto",
+    srcs = ["analysis.proto"],
+    deps = [":build_proto"],
+)
+
+java_proto_library(
+    name = "analysis_java_proto",
+    deps = [":analysis_proto"],
+)
+
+java_library_srcs(
+    name = "analysis_java_proto_srcs",
+    deps = [":analysis_java_proto"],
+)
+
 # This new option tagging method is in flux while being applied to the options
 # in the Bazel code base. The visibility should not be changed to allow external
 # dependencies until the interface has stabilized and can commit to maintaining
@@ -156,6 +171,7 @@ filegroup(
 filegroup(
     name = "dist_jars",
     srcs = [s + "_java_proto_srcs" for s in FILES] + [
+        ":analysis_java_proto_srcs",
         ":command_line_java_proto_srcs",
         ":command_server_java_grpc_srcs",
         ":option_filters_java_proto_srcs",
diff --git a/src/main/protobuf/analysis.proto b/src/main/protobuf/analysis.proto
index ec7e7fd679..017df32250 100644
--- a/src/main/protobuf/analysis.proto
+++ b/src/main/protobuf/analysis.proto
@@ -19,6 +19,8 @@ package analysis;
 option java_package = "com.google.devtools.build.lib.analysis";
 option java_outer_classname = "AnalysisProtos";
 
+import "src/main/protobuf/build.proto";
+
 // Container for the action graph properties.
 message ActionGraphContainer {
   repeated Artifact artifacts = 1;
@@ -146,6 +148,9 @@ message Configuration {
 
   // The platform string.
   string platform_name = 3;
+
+  // The checksum representation of the configuration options;
+  string checksum = 4;
 }
 
 message KeyValuePair {
@@ -155,3 +160,20 @@ message KeyValuePair {
   // The variable value.
   string value = 2;
 }
+
+message ConfiguredTarget {
+  // The target. We use blaze_query.Target defined in build.proto instead of
+  // the Target defined in this file because blaze_query.Target is much heavier
+  // and will output proto results similar to what users are familiar with from
+  // regular blaze query.
+  blaze_query.Target target = 1;
+
+  // The configuration
+  Configuration configuration = 2;
+}
+
+// Container for cquery results
+message CqueryResult {
+  // All the configuredtargets returns by cquery
+  repeated ConfiguredTarget results = 1;
+}