diff options
| author |  Alex Humesky <ahumesky@google.com> | 2015-11-12 16:52:23 +0000 |
|---|---|---|
| committer |  Lukacs Berki <lberki@google.com> | 2015-11-13 10:19:56 +0000 |
| commit | ee0ade3ae1763cb0f9ed989e7692563a547f8559 (patch) | |
| tree | 8433dfe8f61cd3af5506a01717238d19946167cf /src/test/java/com/google/devtools/build/lib | |
| parent | 63aa7e8e6d0f23e21d860fd6830176a03523c972 (diff) | |
Hardcodes Linux as the platform for the NDK crosstool unit tests because that's what the test data is based on. Fixes #581.
--
MOS_MIGRATED_REVID=107687820
Diffstat (limited to 'src/test/java/com/google/devtools/build/lib')
| -rw-r--r-- | src/test/java/com/google/devtools/build/lib/bazel/rules/android/ndkcrosstools/AndroidNdkCrosstoolsTest.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/test/java/com/google/devtools/build/lib/bazel/rules/android/ndkcrosstools/AndroidNdkCrosstoolsTest.java b/src/test/java/com/google/devtools/build/lib/bazel/rules/android/ndkcrosstools/AndroidNdkCrosstoolsTest.java index 432cddd8a2..9556b6e622 100644 --- a/src/test/java/com/google/devtools/build/lib/bazel/rules/android/ndkcrosstools/AndroidNdkCrosstoolsTest.java +++ b/src/test/java/com/google/devtools/build/lib/bazel/rules/android/ndkcrosstools/AndroidNdkCrosstoolsTest.java @@ -61,7 +61,8 @@ public class AndroidNdkCrosstoolsTest { static { try { - String hostPlatform = AndroidNdkCrosstools.getHostPlatform(NDK_RELEASE); + // NDK test data is based on the x86 64-bit Linux Android NDK. + String hostPlatform = "linux-x86_64"; NdkPaths ndkPaths = new NdkPaths( REPOSITORY_NAME, hostPlatform, |