aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar Philipp Wollermann <philwo@google.com>2015-10-27 16:46:24 +0000
committerGravatar David Chen <dzc@google.com>2015-10-27 19:44:05 +0000
commit726415ca0addac817217bb6d3c6c67c14576304b (patch)
tree235c4774414104ed95e842ae37dd687a9a398543
parent80f53a7a31f1aaaf7d4ec84cb10a5205433d61ee (diff)
Fixes a wrong path causing the *-toolchain_files filegroup to actually be empty:
philwo@philwo:/tmp/bazel$ ./output/bazel query 'labels(srcs, @androidndk//:arm-linux-androideabi-4.9-v7a-gnu-libstdcpp-toolchain_files)' INFO: Empty results This caused compiliation failures when building //examples/android/java/bazel:hello_world with sandboxing enabled. -- MOS_MIGRATED_REVID=106405986
-rw-r--r--src/main/java/com/google/devtools/build/lib/bazel/rules/android/android_ndk_cc_toolchain_template.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/android/android_ndk_cc_toolchain_template.txt b/src/main/java/com/google/devtools/build/lib/bazel/rules/android/android_ndk_cc_toolchain_template.txt
index b3ad5036c3..9bae5af644 100644
--- a/src/main/java/com/google/devtools/build/lib/bazel/rules/android/android_ndk_cc_toolchain_template.txt
+++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/android/android_ndk_cc_toolchain_template.txt
@@ -18,7 +18,7 @@ cc_toolchain(
filegroup(
name = "%toolchainName%-toolchain_files",
- srcs = glob(["toolchains/%toolchainDirectory%/**"]),
+ srcs = glob(["ndk/toolchains/%toolchainDirectory%/**"]),
output_licenses = ["unencumbered"],
)