From 654717f6f2e9e626b60debc657d3a8723f057b97 Mon Sep 17 00:00:00 2001 From: Dmitry Lomov Date: Thu, 2 Mar 2017 14:39:52 +0000 Subject: Refactor implementation of native and Skylark declared providers. 1) Instead of having a single class for both, split them into {Skylark,Native}ClassObjectConstructors 2) Allow NativeClassObjectConstructors to customize their instantiation logic. 3) Prepare ClassObjectConstructor.Key to be serializable. -- PiperOrigin-RevId: 148997553 MOS_MIGRATED_REVID=148997553 --- .../devtools/build/lib/rules/objc/ObjcProviderSkylarkConverters.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/main/java/com/google/devtools/build/lib/rules/objc/ObjcProviderSkylarkConverters.java') diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcProviderSkylarkConverters.java b/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcProviderSkylarkConverters.java index ee8a37c35f..46665908ee 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcProviderSkylarkConverters.java +++ b/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcProviderSkylarkConverters.java @@ -24,8 +24,8 @@ import com.google.common.collect.ImmutableMap; import com.google.devtools.build.lib.actions.Artifact; import com.google.devtools.build.lib.collect.nestedset.NestedSet; import com.google.devtools.build.lib.collect.nestedset.NestedSetBuilder; +import com.google.devtools.build.lib.packages.NativeClassObjectConstructor; import com.google.devtools.build.lib.packages.SkylarkClassObject; -import com.google.devtools.build.lib.packages.SkylarkClassObjectConstructor; import com.google.devtools.build.lib.rules.objc.ObjcProvider.Key; import com.google.devtools.build.lib.syntax.EvalException; import com.google.devtools.build.lib.syntax.EvalUtils; @@ -162,7 +162,7 @@ public class ObjcProviderSkylarkConverters { public Object valueForSkylark(Key javaKey, NestedSet javaValue) { NestedSetBuilder result = NestedSetBuilder.stableOrder(); for (BundleableFile bundleableFile : (Iterable) javaValue) { - result.add(SkylarkClassObjectConstructor.STRUCT.create( + result.add(NativeClassObjectConstructor.STRUCT.create( ImmutableMap.of( BUNDLED_FIELD, bundleableFile.getBundled(), BUNDLE_PATH_FIELD, bundleableFile.getBundlePath() -- cgit v1.2.3