diff options
| author |  dslomov <dslomov@google.com> | 2017-07-27 23:48:56 +0200 |
|---|---|---|
| committer |  Jakob Buchgraber <buchgr@google.com> | 2017-07-28 10:44:54 +0200 |
| commit | 11da2203a00bb8121275d9a110190d7f70df1073 (patch) | |
| tree | 97a5aab8d40af86af9a7068c91c17d2fdca1201c /src/main/java/com/google/devtools/build/lib/rules/android/AndroidDeviceScriptFixtureInfoProvider.java | |
| parent | da4c959603280ded71ad8fbc2d30d4917b175750 (diff) | |
Assert that declared providers are not TransitiveInfoProviders.
Also fix the remaining violations.
RELNOTES: None.
PiperOrigin-RevId: 163391215
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/rules/android/AndroidDeviceScriptFixtureInfoProvider.java')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/android/AndroidDeviceScriptFixtureInfoProvider.java | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidDeviceScriptFixtureInfoProvider.java b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidDeviceScriptFixtureInfoProvider.java index 8d44854a39..901b2e2dde 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidDeviceScriptFixtureInfoProvider.java +++ b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidDeviceScriptFixtureInfoProvider.java @@ -15,7 +15,6 @@ package com.google.devtools.build.lib.rules.android; import com.google.common.collect.ImmutableMap; import com.google.devtools.build.lib.actions.Artifact; -import com.google.devtools.build.lib.analysis.TransitiveInfoProvider; import com.google.devtools.build.lib.collect.nestedset.NestedSet; import com.google.devtools.build.lib.concurrent.ThreadSafety.Immutable; import com.google.devtools.build.lib.packages.NativeClassObjectConstructor; @@ -26,12 +25,11 @@ import com.google.devtools.build.lib.packages.SkylarkClassObject; * android_instrumentation_test}. */ @Immutable -public class AndroidDeviceScriptFixtureInfoProvider extends SkylarkClassObject - implements TransitiveInfoProvider { +public class AndroidDeviceScriptFixtureInfoProvider extends SkylarkClassObject { private static final String SKYLARK_NAME = "DeviceScriptFixtureInfo"; public static final NativeClassObjectConstructor<AndroidDeviceScriptFixtureInfoProvider> - ANDROID_DEVICE_SCRIPT_FIXTURE_INFO = + SKYLARK_CONSTRUCTOR = new NativeClassObjectConstructor<AndroidDeviceScriptFixtureInfoProvider>( AndroidDeviceScriptFixtureInfoProvider.class, SKYLARK_NAME) {}; @@ -42,7 +40,7 @@ public class AndroidDeviceScriptFixtureInfoProvider extends SkylarkClassObject public AndroidDeviceScriptFixtureInfoProvider( Artifact fixtureScript, NestedSet<Artifact> supportApks, boolean daemon, boolean strictExit) { - super(ANDROID_DEVICE_SCRIPT_FIXTURE_INFO, ImmutableMap.<String, Object>of()); + super(SKYLARK_CONSTRUCTOR, ImmutableMap.<String, Object>of()); this.fixtureScript = fixtureScript; this.supportApks = supportApks; this.daemon = daemon; |