diff options
| author |  Adam Michael <ajmichael@google.com> | 2016-11-16 23:04:46 +0000 |
|---|---|---|
| committer |  Kristina Chodorow <kchodorow@google.com> | 2016-11-17 18:18:13 +0000 |
| commit | 8a136d8f12b3e78b4b5e2bb5d1cd6647e6ffc9f0 (patch) | |
| tree | 688099acd3977dc0087af9325e5c8eaa39544da7 | |
| parent | 7a41ce90cc1bc2cd47b1558d0124e0fff1e8d5b7 (diff) | |
Update comments in Bazel WORKSPACE regarding running maven_skylark_test.
test_maven_aar_skylark is essentially an android_integration_test and as such
requires that android_sdk_for_testing and android_ndk_for_testing be properly
set up.
See https://github.com/bazelbuild/bazel/issues/2086
--
MOS_MIGRATED_REVID=139384309
| -rw-r--r-- | WORKSPACE | 11 | ||||
| -rw-r--r-- | src/test/shell/bazel/BUILD | 3 |
2 files changed, 8 insertions, 6 deletions
@@ -47,14 +47,15 @@ docker_repository() # load("/WORKSPACE.user", "android_repositories") # android_repositories() +# In order to run //src/test/shell/bazel:maven_skylark_test, follow the +# instructions above for the Android integration tests and uncomment the +# following lines: +# load("//tools/build_defs/repo:maven_rules.bzl", "maven_dependency_plugin") +# maven_dependency_plugin() + # This allows rules written in skylark to locate apple build tools. bind(name = "xcrunwrapper", actual = "@bazel_tools//tools/objc:xcrunwrapper") bind(name = "protobuf/java_runtime", actual = "//third_party/protobuf:protobuf") bind(name = "protobuf/javalite_runtime", actual = "//third_party/protobuf:protobuf-lite") bind(name = "proto/toolchains/java", actual = "//third_party/protobuf:java_toolchain") - -# For Skylark tests at //src/test/shell/bazel:maven_skylark_test -# Uncomment the following lines, and the test in src/test/shell/bazel/BUILD to run it. -# load("//tools/build_defs/repo:maven_rules.bzl", "maven_dependency_plugin") -# maven_dependency_plugin() diff --git a/src/test/shell/bazel/BUILD b/src/test/shell/bazel/BUILD index e24b174083..4c972ff418 100644 --- a/src/test/shell/bazel/BUILD +++ b/src/test/shell/bazel/BUILD @@ -249,7 +249,8 @@ sh_test( data = [":test-deps"], ) -# To run this test, ensure that the maven_dependency_plugin() in WORKSPACE is uncommented as well. +# To run this test, ensure that maven_dependency_plugin() and +# android_repositories() in WORKSPACE are uncommented. sh_test( name = "maven_skylark_test", size = "medium", |