Deprecate and remove several uses of the 'values' map in NativeInfo subclasses.

These subclasses should be using @SkylarkCallable(structField = true) instead
This is a bit of a memory win, as there is now no need to store field information twice.

There are still a couple of stragglers that are more difficult, namely ToolchainInfo and DefaultInfo. Their APIs will likely need some more extensive revamping before proceeding.

RELNOTES: None.
PiperOrigin-RevId: 187364392

1 files changed, 7 insertions, 6 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/packages/NativeInfo.java b/src/main/java/com/google/devtools/build/lib/packages/NativeInfo.java
index 58ea8d3ea0..16d0c642d6 100644
--- a/src/main/java/com/google/devtools/build/lib/packages/NativeInfo.java
+++ b/src/main/java/com/google/devtools/build/lib/packages/NativeInfo.java
@@ -59,16 +59,17 @@ public class NativeInfo extends Info {
   }
 
   public NativeInfo(NativeProvider<?> provider) {
-    super(provider, Location.BUILTIN);
-    this.values = ImmutableMap.of();
+    this(provider, Location.BUILTIN);
   }
 
+  public NativeInfo(NativeProvider<?> provider, Location loc) {
+    this(provider, ImmutableMap.of(), loc);
+  }
+
+  // TODO(cparsons): Remove this constructor once DefaultInfo and ToolchainInfo stop using it.
+  @Deprecated
   public NativeInfo(NativeProvider<?> provider, Map<String, Object> values, Location loc) {
     super(provider, loc);
     this.values = copyValues(values);
   }
-
-  public NativeInfo(NativeProvider<?> provider, Map<String, Object> values) {
-    this(provider, values, Location.BUILTIN);
-  }
 }