Make some objects frequently encountered during serialization into constants. A lot of care is needed here because we're using reference equality. I plan to add value-equality constants in a follow-up.

Add ImmutableSortedSet marshaller because I think it might have been needed, and hey, why not.

PiperOrigin-RevId: 192326359

1 files changed, 8 insertions, 0 deletions

diff --git a/src/test/java/com/google/devtools/build/lib/rules/apple/AppleConfigurationSerializationTest.java b/src/test/java/com/google/devtools/build/lib/rules/apple/AppleConfigurationSerializationTest.java
index e79ae57585..444f581f1c 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/apple/AppleConfigurationSerializationTest.java
+++ b/src/test/java/com/google/devtools/build/lib/rules/apple/AppleConfigurationSerializationTest.java
@@ -32,6 +32,14 @@ public class AppleConfigurationSerializationTest {
     new SerializationTester(getSubjects()).runTests();
   }
 
+  @Test
+  public void optionsSerialization() throws Exception {
+    new SerializationTester(
+            BuildOptions.of(ImmutableList.of(AppleCommandLineOptions.class))
+                .get(AppleCommandLineOptions.class))
+        .runTests();
+  }
+
   private static ImmutableList<AppleConfiguration> getSubjects() {
     AppleCommandLineOptions firstOptions = new AppleCommandLineOptions();
     firstOptions.mandatoryMinimumVersion = false;