From 6c5157e2472e9d31e5c2dcf42368164946ed1c63 Mon Sep 17 00:00:00 2001
From: jingwen <jingwen@google.com>
Date: Wed, 7 Feb 2018 21:18:21 -0800
Subject: Remove fixture_args from android_instrumentation_test.

These can be part of the fixture targets.

RELNOTES: None.
PiperOrigin-RevId: 184943342
---
 .../build/lib/rules/android/AndroidInstrumentationTest.java        | 7 -------
 .../build/lib/rules/android/AndroidInstrumentationTestRule.java    | 2 --
 .../lib/rules/android/android_instrumentation_test_template.txt    | 2 --
 3 files changed, 11 deletions(-)

(limited to 'src/main')

diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidInstrumentationTest.java b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidInstrumentationTest.java
index f2ec721996..91f7c7be9e 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidInstrumentationTest.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidInstrumentationTest.java
@@ -36,7 +36,6 @@ import com.google.devtools.build.lib.analysis.test.ExecutionInfo;
 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.BuildType;
-import com.google.devtools.build.lib.syntax.Type;
 import com.google.devtools.build.lib.util.ResourceFileLoader;
 import java.io.IOException;
 import javax.annotation.Nullable;
@@ -127,7 +126,6 @@ public class AndroidInstrumentationTest implements RuleConfiguredTargetFactory {
         .add(artifactSubstitution("%target_apk%", getTargetApk(ruleContext)))
         .add(artifactSubstitution("%instrumentation_apk%", getInstrumentationApk(ruleContext)))
         .add(artifactListSubstitution("%support_apks%", getAllSupportApks(ruleContext)))
-        .add(Substitution.ofSpaceSeparatedMap("%fixture_args%", getFixtureArgs(ruleContext)))
         .add(deviceScriptFixturesSubstitution(ruleContext))
         .addAll(hostServiceFixturesSubstitutions(ruleContext))
         .add(artifactListSubstitution("%data_deps%", getDataDeps(ruleContext)))
@@ -256,11 +254,6 @@ public class AndroidInstrumentationTest implements RuleConfiguredTargetFactory {
     return AndroidSdkProvider.fromRuleContext(ruleContext).getAapt();
   }
 
-  /** Map of {@code fixture_args} for the test runner to pass to the {@code fixtures}. */
-  private static ImmutableMap<String, String> getFixtureArgs(RuleContext ruleContext) {
-    return ImmutableMap.copyOf(ruleContext.attributes().get("fixture_args", Type.STRING_DICT));
-  }
-
   private static ImmutableList<Artifact> getDataDeps(RuleContext ruleContext) {
     return ruleContext.getPrerequisiteArtifacts("data", Mode.DATA).list();
   }
diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidInstrumentationTestRule.java b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidInstrumentationTestRule.java
index 13043dea00..99b0df851c 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidInstrumentationTestRule.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidInstrumentationTestRule.java
@@ -16,7 +16,6 @@ package com.google.devtools.build.lib.rules.android;
 import static com.google.devtools.build.lib.packages.Attribute.attr;
 import static com.google.devtools.build.lib.packages.BuildType.LABEL;
 import static com.google.devtools.build.lib.packages.BuildType.LABEL_LIST;
-import static com.google.devtools.build.lib.syntax.Type.STRING_DICT;
 
 import com.google.devtools.build.lib.analysis.BaseRuleClasses;
 import com.google.devtools.build.lib.analysis.RuleDefinition;
@@ -55,7 +54,6 @@ public class AndroidInstrumentationTestRule implements RuleDefinition {
                 .allowedFileTypes(FileTypeSet.NO_FILE)
                 .allowedRuleClasses(
                     "android_device_script_fixture", "android_host_service_fixture"))
-        .add(attr("fixture_args", STRING_DICT))
         .add(
             attr("$test_entry_point", LABEL)
                 .exec()
diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/android_instrumentation_test_template.txt b/src/main/java/com/google/devtools/build/lib/rules/android/android_instrumentation_test_template.txt
index 0219d1618e..4224dcd67a 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/android/android_instrumentation_test_template.txt
+++ b/src/main/java/com/google/devtools/build/lib/rules/android/android_instrumentation_test_template.txt
@@ -65,8 +65,6 @@ declare -A device_script_fixtures=( %device_script_fixtures% )
 host_service_fixture="%host_service_fixture%"
 host_service_fixture_services="%host_service_fixture_services%"
 
-fixture_args="%fixture_args%"
-
 test_suite_property_name='%test_suite_property_name%'
 
 argv=$(cat <<END
-- 
cgit v1.2.3