aboutsummaryrefslogtreecommitdiffhomepage
path: root/src
diff options
context:
space:
mode:
authorGravatar Philipp Wollermann <philwo@google.com>2015-09-22 10:49:30 +0000
committerGravatar Laszlo Csomor <laszlocsomor@google.com>2015-09-22 17:07:34 +0000
commitbfd0f619b34ddec05e1cd7f51236505eb44c569f (patch)
treebbf9b922550a254ba677c6721f8e439373603310 /src
parent10e3b2b22b830f741440deef64f74e3066bc207f (diff)
Fixes ProGuard not working in a sandbox.
-- MOS_MIGRATED_REVID=103632337
Diffstat (limited to 'src')
-rw-r--r--src/main/java/com/google/devtools/build/lib/bazel/rules/android/android_sdk_repository_template.txt13
1 files changed, 12 insertions, 1 deletions
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 18ccb99ada..e97309b8d3 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
@@ -25,7 +25,7 @@ java_import(
android_sdk(
name = "sdk",
- proguard = "tools/proguard/bin/proguard.sh",
+ proguard = ":proguard_binary",
aapt = ":aapt_binary",
dx = ":dx_binary",
main_dex_list_creator = ":main_dex_list_creator",
@@ -44,6 +44,17 @@ android_sdk(
resource_extractor = ":fail"
)
+java_import(
+ name = "proguard_import",
+ jars = ["tools/proguard/lib/proguard.jar"]
+)
+
+java_binary(
+ name = "proguard_binary",
+ main_class = "proguard.ProGuard",
+ runtime_deps = [":proguard_import"]
+)
+
filegroup(
name = "build_tools_libs",
srcs = glob(["build-tools/%build_tools_version%/lib/**"])