diff options
| author |  Adam Michael <ajmichael@google.com> | 2016-10-11 23:43:23 +0000 |
|---|---|---|
| committer |  Yue Gan <yueg@google.com> | 2016-10-12 08:57:02 +0000 |
| commit | 3ea672116db03a8a3898b2d1ca270a610b185286 (patch) | |
| tree | 89cc9fa3cfa7ca2d1e92b061ab1b2209925f7131 /src/test/shell/bazel/test-setup.sh | |
| parent | 79eb4094537d369b22ac72cab4f08a3c1a5f650e (diff) | |
Explicitly specify the directories in the Android SDK needed for tests.
//src/test/shell/bazel/test-setup.sh uses this filegroup to symlink the contents
of the Android SDK into the workspace for the test. However, since we add BUILD
files into the Android SDK, we don't want to copy those into the workspace
because they will be regenerated by the integration test.
Fixes https://github.com/bazelbuild/bazel/issues/1927.
--
MOS_MIGRATED_REVID=135858750
Diffstat (limited to 'src/test/shell/bazel/test-setup.sh')
| -rwxr-xr-x | src/test/shell/bazel/test-setup.sh | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/test/shell/bazel/test-setup.sh b/src/test/shell/bazel/test-setup.sh index b615227c7f..7577d15585 100755 --- a/src/test/shell/bazel/test-setup.sh +++ b/src/test/shell/bazel/test-setup.sh @@ -65,9 +65,7 @@ function setup_android_support() { done for i in $SDK_SRCDIR/*; do - if [[ "$(basename $i)" != "BUILD" ]]; then - ln -s "$i" "$ANDROID_SDK/$(basename $i)" - fi + ln -s "$i" "$ANDROID_SDK/$(basename $i)" done |