diff options
| author |  Dmitry Lomov <dslomov@google.com> | 2017-03-02 14:39:52 +0000 |
|---|---|---|
| committer |  Yue Gan <yueg@google.com> | 2017-03-03 10:35:22 +0000 |
| commit | 654717f6f2e9e626b60debc657d3a8723f057b97 (patch) | |
| tree | 007f6f91cf0c67098be1900cc97550c5c7d912f0 /src/main/java/com/google/devtools/build/lib/rules/python/PyCommon.java | |
| parent | 83514648f2e4e63dcd039e976f3b5d47552e0383 (diff) | |
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
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/rules/python/PyCommon.java')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/python/PyCommon.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/python/PyCommon.java b/src/main/java/com/google/devtools/build/lib/rules/python/PyCommon.java index f5875fa48c..a343883816 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/python/PyCommon.java +++ b/src/main/java/com/google/devtools/build/lib/rules/python/PyCommon.java @@ -39,9 +39,9 @@ import com.google.devtools.build.lib.collect.nestedset.NestedSetBuilder; import com.google.devtools.build.lib.collect.nestedset.Order; import com.google.devtools.build.lib.concurrent.ThreadSafety.Immutable; import com.google.devtools.build.lib.packages.BuildType; +import com.google.devtools.build.lib.packages.NativeClassObjectConstructor; import com.google.devtools.build.lib.packages.Rule; import com.google.devtools.build.lib.packages.SkylarkClassObject; -import com.google.devtools.build.lib.packages.SkylarkClassObjectConstructor; import com.google.devtools.build.lib.rules.cpp.CppFileTypes; import com.google.devtools.build.lib.rules.test.InstrumentedFilesCollector; import com.google.devtools.build.lib.rules.test.InstrumentedFilesCollector.LocalMetadataCollector; @@ -159,7 +159,7 @@ public final class PyCommon { */ public static SkylarkClassObject createSourceProvider( NestedSet<Artifact> transitivePythonSources, boolean isUsingSharedLibrary) { - return SkylarkClassObjectConstructor.STRUCT.create( + return NativeClassObjectConstructor.STRUCT.create( ImmutableMap.<String, Object>of( TRANSITIVE_PYTHON_SRCS, SkylarkNestedSet.of(Artifact.class, transitivePythonSources), |