diff options
author | Jingwen Chen <jingwen@google.com> | 2018-07-17 19:02:09 -0700 |
---|---|---|
committer | Copybara-Service <copybara-piper@google.com> | 2018-07-17 19:03:59 -0700 |
commit | 61a6bea12cf785f605c84af6c85844b0bb8c1775 (patch) | |
tree | 6d96f990267de473247057eda952ff3a84f41f44 /src/test/java/com | |
parent | 6b5205b000fe391faf12f84ed4f2e9ea38ae81ff (diff) |
Android NDK r17 support
[Full NDK changelog](https://github.com/android-ndk/ndk/wiki/Changelog-r17)
Changes related to Bazel's NDK toolchain/CROSSTOOL generation:
- Removed support for targeting mips, mips64, armeabi.
- Bumped bundled clang version to 6.0.2.
- The default STL is now libc++. If Bazel detects that r17 is being used, it
aliases `@androidndk//:default_toolchain` to `@androidndk//:toolchain-libcpp`,
instead of `@androidndk//:toolchain-gnu-libstdcpp`.
- Removed tests that build against armeabi, mips, mips64.
- Stop passing `-fno-integrated-as` into the compiler by default.
TODO:
- [x] Java tests
- [x] ~Support for wrap.sh to use with ASANs~ Implementing in follow up PR.
- [ ] Fix or disable remote caching with android_ndk_integration_test https://github.com/bazelbuild/bazel/issues/4663
Fixes https://github.com/bazelbuild/bazel/issues/4742
RELNOTES: Added support for Android NDK r17. The default STL is now `libc++`, and support for targeting `mips`, `mips64` and `ARMv5` (`armeabi`) has been removed.
Closes #5371.
Change-Id: Id1ded004c3a80ea62f307746dc3ad6f633f2df2e
PiperOrigin-RevId: 205013758
Diffstat (limited to 'src/test/java/com')
-rw-r--r-- | src/test/java/com/google/devtools/build/lib/bazel/rules/android/AndroidNdkRepositoryTest.java | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/src/test/java/com/google/devtools/build/lib/bazel/rules/android/AndroidNdkRepositoryTest.java b/src/test/java/com/google/devtools/build/lib/bazel/rules/android/AndroidNdkRepositoryTest.java index 232a553d5d..8dfc8a6ce5 100644 --- a/src/test/java/com/google/devtools/build/lib/bazel/rules/android/AndroidNdkRepositoryTest.java +++ b/src/test/java/com/google/devtools/build/lib/bazel/rules/android/AndroidNdkRepositoryTest.java @@ -102,7 +102,7 @@ public class AndroidNdkRepositoryTest extends BuildViewTestCase { eventCollector, "The revision of the Android NDK referenced by android_ndk_repository rule 'androidndk' " + "could not be determined (the revision string found is 'not a valid release string')." - + " Bazel will attempt to treat the NDK as if it was r16."); + + " Bazel will attempt to treat the NDK as if it was r17."); } @Test @@ -128,7 +128,7 @@ public class AndroidNdkRepositoryTest extends BuildViewTestCase { eventCollector, "The revision of the Android NDK referenced by android_ndk_repository rule 'androidndk' " + "could not be determined (the revision string found is 'invalid package revision'). " - + "Bazel will attempt to treat the NDK as if it was r16."); + + "Bazel will attempt to treat the NDK as if it was r17."); } @Test @@ -143,18 +143,16 @@ public class AndroidNdkRepositoryTest extends BuildViewTestCase { ")"); scratch.overwriteFile( - "/ndk/source.properties", - "Pkg.Desc = Android NDK", - "Pkg.Revision = 17.0.3675639-beta2"); + "/ndk/source.properties", "Pkg.Desc = Android NDK", "Pkg.Revision = 18.0.3675639-beta2"); invalidatePackages(); assertThat(getConfiguredTarget("@androidndk//:files")).isNotNull(); MoreAsserts.assertContainsEvent( eventCollector, "The major revision of the Android NDK referenced by android_ndk_repository rule " - + "'androidndk' is 17. The major revisions supported by Bazel are " - + "[10, 11, 12, 13, 14, 15, 16]. Bazel will attempt to treat the NDK as if it was " - + "r16."); + + "'androidndk' is 18. The major revisions supported by Bazel are " + + "[10, 11, 12, 13, 14, 15, 16, 17]. Bazel will attempt to treat the NDK as if it was " + + "r17."); } @Test |