diff options
| author |  Adam Michael <ajmichael@google.com> | 2017-03-23 18:40:51 +0000 |
|---|---|---|
| committer |  Yue Gan <yueg@google.com> | 2017-03-24 12:16:55 +0000 |
| commit | 9b7330fb2ec743f6e36b53e71ca39459a4ab4282 (patch) | |
| tree | 52803cc03b10ac658603a78e1ab02e71a49dd877 /compile.sh | |
| parent | 40bf169dfad2a3285d255c9100450b29be63202c (diff) | |
Simplify the steps needed to run android_integration_test.
As of Bazel 0.4.5, the android_sdk_for_test and android_ndk_for_test are bound in android.WORKSPACE, so we do not need to include them in the main Bazel WORKSPACE file. I've update the comments to reflect that all that is needed to run the tests is android_sdk_repository and android_ndk_repository and the environment variables that they read.
Also, delete scripts/workspace_user.sh. All of its functionality (reading environment variables, detecting api levels, build tools versions) is now part of android_{s,n}dk_repository.
Fixes https://github.com/bazelbuild/bazel/issues/2284.
--
PiperOrigin-RevId: 151032551
MOS_MIGRATED_REVID=151032551
Diffstat (limited to 'compile.sh')
| -rwxr-xr-x | compile.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/compile.sh b/compile.sh index 2b5c073f43..7d9be4cbb1 100755 --- a/compile.sh +++ b/compile.sh @@ -179,7 +179,7 @@ if [ $DO_SRCS_TEST ]; then # See file BUILD for the list of grep -v exceptions. # tools/defaults package is hidden by Bazel so cannot be put in the srcs. find . -type f | sed -e 's|./||' \ - | grep -v '^bazel-' | grep -v '^WORKSPACE.user.bzl' \ + | grep -v '^bazel-' \ | grep -v '^\.' | grep -v '^out/' | grep -v '^output/' \ | grep -v '^derived' \ | grep -Ev "${SRCS_EXCLUDES}" \ |