diff options
| author |  Kristina Chodorow <kchodorow@google.com> | 2016-05-31 15:35:33 +0000 |
|---|---|---|
| committer | Kristina Chodorow <kchodorow@google.com> | 2016-05-31 18:07:44 +0000 |
| commit | dc54452bafbb50029ba11678ade3ad85ad028817 (patch) | |
| tree | d51171bf1de0fdc7cd0562099cfccb4b54f52c9d /src/main/java/com/google | |
| parent | a8efe484a666a36cb545114c272e4e07cc3b3b5a (diff) | |
Make Android rules/tests refer to the correct runfiles paths
Fixes the android part of #1316.
--
MOS_MIGRATED_REVID=123644129
Diffstat (limited to 'src/main/java/com/google')
2 files changed, 0 insertions, 2 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/android/AndroidSdkRepositoryFunction.java b/src/main/java/com/google/devtools/build/lib/bazel/rules/android/AndroidSdkRepositoryFunction.java index f91c973ba5..7285c056bf 100644 --- a/src/main/java/com/google/devtools/build/lib/bazel/rules/android/AndroidSdkRepositoryFunction.java +++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/android/AndroidSdkRepositoryFunction.java @@ -86,7 +86,6 @@ public class AndroidSdkRepositoryFunction extends RepositoryFunction { String template = getStringResource("android_sdk_repository_template.txt"); String buildFile = template - .replaceAll("%workspace_name%", rule.getWorkspaceName()) .replaceAll("%repository_name%", rule.getName()) .replaceAll("%build_tools_version%", buildToolsVersion) .replaceAll("%build_tools_directory%", buildToolsDirectory) diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/android/android_sdk_repository_template.txt b/src/main/java/com/google/devtools/build/lib/bazel/rules/android/android_sdk_repository_template.txt index f6317cfaf7..e82b5e4c16 100644 --- a/src/main/java/com/google/devtools/build/lib/bazel/rules/android/android_sdk_repository_template.txt +++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/android/android_sdk_repository_template.txt @@ -7,5 +7,4 @@ create_android_sdk_rules( build_tools_version = "%build_tools_version%", build_tools_directory = "%build_tools_directory%", api_level = %api_level%, - workspace_name = "%workspace_name%", ) |