diff options
author | Igor Murashkin <iam@google.com> | 2018-08-10 18:10:34 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2018-08-10 18:10:34 -0700 |
commit | 08f5e0013177b641b6dc13d7baa57942f02d51ba (patch) | |
tree | 5a861d123ffb6812514a26ee12d84b08ef992692 | |
parent | 5073ba27ba0e6d2dfc36d7e9f3a3682af2f1795e (diff) | |
parent | af518306412775ff59b181263eeb509eb928269d (diff) | |
download | RxCpp-08f5e0013177b641b6dc13d7baa57942f02d51ba.tar.gz |
android: Add nortti/noexcept test targets am: a13888fd0e am: fb0738b3b9
am: af51830641
Change-Id: I6d6561355ed16203878e08284bc39e99ac8e00b9
-rw-r--r-- | Android.bp | 27 |
1 files changed, 21 insertions, 6 deletions
@@ -18,17 +18,32 @@ cc_library_headers { export_include_dirs: ["Rx/v2/src"] } -cc_test { - name: "librxcpp-tests", +cc_defaults { + name: "librxcpp-tests-defaults", host_supported: true, srcs: [ "Rx/v2/test/**/*.cpp", ], - whole_static_libs: ["libcatch2-upstream"], header_libs: ["librxcpp"], gtest: false, - // Temporarily allow exceptions for all the use of try/catch in rxcpp. +} + +cc_test { + // "Upstream" config. Use exceptions. + // Ensure that if we update from upstream later that the merged code + // is still working on Android. + name: "librxcpp-tests-upstream", + defaults: ["librxcpp-tests-defaults"], + whole_static_libs: ["libcatch2-upstream"], + // Allow exceptions for all the use of try/catch/throw in rxcpp. cflags: ["-fexceptions"], - // Enable RTTI required to compile libcatch. - rtti: true, +} + +cc_test { + // "AOSP" config. Disable exceptions. + // Anything in AOSP using librxcpp will use it as this config, so + // that's what we really care about testing. + name: "librxcpp-tests", + defaults: ["librxcpp-tests-defaults"], + whole_static_libs: ["libcatch2"], } |