Move android_sdk_for_testing bind into Android{S,N}dkRepositoryRule so that eventually we can remove it from Bazel's WORKSPACE file.

aj-michael · kchodorow · commit eb46a1b63a87 · 2017-02-07T18:27:26.000Z
We'll need to wait for the next Bazel release to remove it from the WORKSPACE file. This should hopefully make the process of the Bazel sheriff running android_integration_test.sh a little easier.

--
PiperOrigin-RevId: 146789106
MOS_MIGRATED_REVID=146789106
diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/android/AndroidNdkRepositoryRule.java b/src/main/java/com/google/devtools/build/lib/bazel/rules/android/AndroidNdkRepositoryRule.java
@@ -49,7 +49,9 @@ public Map<String, Label> apply(Rule rule) {
 
           return ImmutableMap.of(
               "android/crosstool",
-              Label.parseAbsoluteUnchecked("@" + rule.getName() + "//:" + defaultToolchainName));
+              Label.parseAbsoluteUnchecked("@" + rule.getName() + "//:" + defaultToolchainName),
+              "android_ndk_for_testing",
+              Label.parseAbsoluteUnchecked("@" + rule.getName() + "//:files"));
         }
       };
 
diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/android/AndroidSdkRepositoryRule.java b/src/main/java/com/google/devtools/build/lib/bazel/rules/android/AndroidSdkRepositoryRule.java
@@ -47,6 +47,7 @@ public Map<String, Label> apply(Rule rule) {
           builder.put("android/sdk", Label.parseAbsoluteUnchecked(prefix + "sdk"));
           builder.put(
               "android/dx_jar_import", Label.parseAbsoluteUnchecked(prefix + "dx_jar_import"));
+          builder.put("android_sdk_for_testing", Label.parseAbsoluteUnchecked(prefix + "files"));
           return builder.build();
         }
       };
diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/android/android.WORKSPACE b/src/main/java/com/google/devtools/build/lib/bazel/rules/android/android.WORKSPACE
@@ -1,2 +1,4 @@
 bind(name = "android/sdk")
 bind(name = "android/crosstool", actual = "@bazel_tools//tools/cpp:toolchain")
+bind(name = "android_sdk_for_testing", actual = "//:dummy")
+bind(name = "android_ndk_for_testing", actual = "//:dummy")

Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,9 @@ public Map<String, Label> apply(Rule rule) {`
`49`	`49`
`50`	`50`	`return ImmutableMap.of(`
`51`	`51`	`"android/crosstool",`
`52`		`- Label.parseAbsoluteUnchecked("@" + rule.getName() + "//:" + defaultToolchainName));`
	`52`	`+ Label.parseAbsoluteUnchecked("@" + rule.getName() + "//:" + defaultToolchainName),`
	`53`	`+ "android_ndk_for_testing",`
	`54`	`+ Label.parseAbsoluteUnchecked("@" + rule.getName() + "//:files"));`
`53`	`55`	`}`
`54`	`56`	`};`
`55`	`57`
Original file line number	Diff line number	Diff line change
`@@ -47,6 +47,7 @@ public Map<String, Label> apply(Rule rule) {`
`47`	`47`	`builder.put("android/sdk", Label.parseAbsoluteUnchecked(prefix + "sdk"));`
`48`	`48`	`builder.put(`
`49`	`49`	`"android/dx_jar_import", Label.parseAbsoluteUnchecked(prefix + "dx_jar_import"));`
	`50`	`+ builder.put("android_sdk_for_testing", Label.parseAbsoluteUnchecked(prefix + "files"));`
`50`	`51`	`return builder.build();`
`51`	`52`	`}`
`52`	`53`	`};`