diff options
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/analysis/config/BuildConfiguration.java | 15 | ||||
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/buildeventstream/proto/build_event_stream.proto | 1 |
2 files changed, 8 insertions, 8 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/config/BuildConfiguration.java b/src/main/java/com/google/devtools/build/lib/analysis/config/BuildConfiguration.java index 44bcbc7857..62307e489c 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/config/BuildConfiguration.java +++ b/src/main/java/com/google/devtools/build/lib/analysis/config/BuildConfiguration.java @@ -2712,13 +2712,12 @@ public final class BuildConfiguration implements BuildEvent { @Override public BuildEventStreamProtos.BuildEvent asStreamProto(BuildEventConverters converters) { - return GenericBuildEvent.protoChaining(this) - .setConfiguration( - BuildEventStreamProtos.Configuration.newBuilder() - .setMnemonic(getMnemonic()) - .setPlatformName(getPlatformName()) - .setCpu(getCpu()) - .build()) - .build(); + BuildEventStreamProtos.Configuration.Builder builder = + BuildEventStreamProtos.Configuration.newBuilder() + .setMnemonic(getMnemonic()) + .setPlatformName(getPlatformName()) + .putAllMakeVariable(getMakeEnvironment()) + .setCpu(getCpu()); + return GenericBuildEvent.protoChaining(this).setConfiguration(builder.build()).build(); } } diff --git a/src/main/java/com/google/devtools/build/lib/buildeventstream/proto/build_event_stream.proto b/src/main/java/com/google/devtools/build/lib/buildeventstream/proto/build_event_stream.proto index 02f9f2a5f7..6d150d53af 100644 --- a/src/main/java/com/google/devtools/build/lib/buildeventstream/proto/build_event_stream.proto +++ b/src/main/java/com/google/devtools/build/lib/buildeventstream/proto/build_event_stream.proto @@ -268,6 +268,7 @@ message Configuration { string mnemonic = 1; string platform_name = 2; string cpu = 3; + map<string, string> make_variable = 4; } // Payload of the event indicating the expansion of a target pattern. |