Make android_binary work with sandboxing. Note that "bazel mobile-install" is still broken owing to a bug in the code of the sandbox (#413)
The alternative to hand-listing the dependencies of apkbuilder is to glob all the jars in tools/lib. It would be more robust, but would take a little more time in the loading phase and on the startup of apkbuilder. Let's see how far we get with this approach.
Quite an embarrassing omission, owing to the lack of integration tests, which was in turn caused by us not having a continuous build. Now that we have one, we can actually write an integration test.
--
MOS_MIGRATED_REVID=102123234
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 27d0aa2..0af42b2 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
@@ -22,7 +22,7 @@
name = "sdk",
proguard = "tools/proguard/bin/proguard.sh",
aapt = "build-tools/%build_tools_version%/aapt",
- dx = "build-tools/%build_tools_version%/dx",
+ dx = "dx_binary",
main_dex_list_creator = ":main_dex_list_creator",
adb = "platform-tools/adb",
framework_aidl = "platforms/android-%api_level%/framework.aidl",
@@ -105,4 +105,4 @@
java_import(
name = "sdklib",
- jars = ["tools/lib/sdklib.jar", "tools/lib/common.jar"])
+ jars = ["tools/lib/sdklib.jar", "tools/lib/common.jar", "tools/lib/guava-17.0.jar"])
