Change Platform.remoteExecutionProperties to be a String, not a dict.

This is needed for the ability to synthesize the correct remote
execution protos from a platform rule.

Part of #4128.

Change-Id: I7fa8acf45642a4df4e2beb1ba9c57c2536670486
PiperOrigin-RevId: 176504885

2 files changed, 4 insertions, 9 deletions

diff --git a/src/test/java/com/google/devtools/build/lib/analysis/platform/PlatformInfoTest.java b/src/test/java/com/google/devtools/build/lib/analysis/platform/PlatformInfoTest.java
index e8dd2fd1bc..fa0add7958 100644
--- a/src/test/java/com/google/devtools/build/lib/analysis/platform/PlatformInfoTest.java
+++ b/src/test/java/com/google/devtools/build/lib/analysis/platform/PlatformInfoTest.java
@@ -100,7 +100,7 @@ public class PlatformInfoTest extends BuildViewTestCase {
                 .setLabel(makeLabel("//platform/plat1"))
                 .addConstraint(value1)
                 .addConstraint(value2)
-                .addRemoteExecutionProperty("key", "val") // execution properties are ignored.
+                .setRemoteExecutionProperties("key=val") // execution properties are ignored.
                 .build())
         .addEqualityGroup(
             // Different label.
@@ -161,7 +161,7 @@ public class PlatformInfoTest extends BuildViewTestCase {
     ConstraintValueInfo constraintValue =
         ConstraintValueInfo.create(constraintSetting, makeLabel("//constraint:foo"));
     assertThat(provider.constraints()).containsExactly(constraintValue);
-    assertThat(provider.remoteExecutionProperties()).isEmpty();
+    assertThat(provider.remoteExecutionProperties()).isNull();
   }
 
   @Test
diff --git a/src/test/java/com/google/devtools/build/lib/rules/platform/PlatformTest.java b/src/test/java/com/google/devtools/build/lib/rules/platform/PlatformTest.java
index 52e9219b79..bfbca10cea 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/platform/PlatformTest.java
+++ b/src/test/java/com/google/devtools/build/lib/rules/platform/PlatformTest.java
@@ -16,7 +16,6 @@ package com.google.devtools.build.lib.rules.platform;
 
 import static com.google.common.truth.Truth.assertThat;
 
-import com.google.common.collect.ImmutableMap;
 import com.google.devtools.build.lib.analysis.ConfiguredTarget;
 import com.google.devtools.build.lib.analysis.platform.ConstraintSettingInfo;
 import com.google.devtools.build.lib.analysis.platform.ConstraintValueInfo;
@@ -147,10 +146,7 @@ public class PlatformTest extends BuildViewTestCase {
         "    constraint_values = [",
         "       '//constraint:foo',",
         "    ],",
-        "    remote_execution_properties = {",
-        "        'foo': 'val1',",
-        "        'bar': 'val2',",
-        "    },",
+        "    remote_execution_properties = 'foo: val1',",
         ")");
 
     ConfiguredTarget platform = getConfiguredTarget("//constraint/remote:plat_remote");
@@ -158,8 +154,7 @@ public class PlatformTest extends BuildViewTestCase {
 
     PlatformInfo provider = PlatformProviderUtils.platform(platform);
     assertThat(provider).isNotNull();
-    assertThat(provider.remoteExecutionProperties())
-        .containsExactlyEntriesIn(ImmutableMap.of("foo", "val1", "bar", "val2"));
+    assertThat(provider.remoteExecutionProperties()).isEqualTo("foo: val1");
   }
 
   @Test