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 /WORKSPACE | |
| 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 'WORKSPACE')
| -rw-r--r-- | WORKSPACE | 24 |
1 files changed, 9 insertions, 15 deletions
@@ -8,17 +8,6 @@ bind( actual = "//:dummy", ) -# Bind to dummy targets if no android SDK/NDK is present. -bind( - name = "android_sdk_for_testing", - actual = "//:dummy", -) - -bind( - name = "android_ndk_for_testing", - actual = "//:dummy", -) - # Protobuf code generation for GRPC requires three external labels: # //external:grpc-java_plugin # //external:grpc-jar @@ -42,10 +31,15 @@ bind( load("//tools/cpp/test:docker_repository.bzl", "docker_repository") docker_repository() -# In order to run the Android integration tests, run -# scripts/workspace_user.sh and uncomment the next two lines. -# load("/WORKSPACE.user", "android_repositories") -# android_repositories() +# To run the Android integration tests in //src/test/shell/bazel/android:all or +# build the Android sample app in //examples/android/java/bazel:hello_world +# +# 1. Install an Android SDK and NDK from https://developer.android.com +# 2. Set the $ANDROID_HOME and $ANDROID_NDK_HOME environment variables +# 3. Uncomment the two lines below +# +# android_sdk_repository(name = "androidsdk") +# android_ndk_repository(name = "androidndk") # In order to run //src/test/shell/bazel:maven_skylark_test, follow the # instructions above for the Android integration tests and uncomment the |