diff options
| author | Abseil Team <absl-team@google.com> | 2020-03-12T16·41-0700 |
|---|---|---|
| committer | Derek Mauro <dmauro@google.com> | 2020-03-12T16·46-0400 |
| commit | c6954897f7ece5011f0126db9117361dc1a6ff36 (patch) | |
| tree | 77751f0d6868522e891c8dd816fbc4a01448bc18 /absl/base | |
| parent | b92f35f65fa5298d430eab49c1831b5f3e9594c8 (diff) | |
Export of internal Abseil changes
-- 66a0a46462692378f77518f9db766a218bfac40b by Derek Mauro <dmauro@google.com>: Internal change PiperOrigin-RevId: 300565981 -- 2a1ad67662b2e22beec7d3be019e6bba23c41c7f by Derek Mauro <dmauro@google.com>: Fix CompressedTuple move constructor on MSVC Imports GitHub #637 PiperOrigin-RevId: 300545840 -- a3ee3ad036bbb6b0031121fd58299e5c59a243e1 by Derek Mauro <dmauro@google.com>: Disable LLVM's XRay instrumentation on Android Fixes #626 PiperOrigin-RevId: 300540906 -- 87999244b1f825e585ec12a431086cb60daeb24f by Gennadiy Rozental <rogeeff@google.com>: Increase max cord depth by 2. After reviewing of the paper we can prove that the algorithm in fact can lead to slightly larger max depth. PiperOrigin-RevId: 300422376 -- 98de175ee8ad33290ef883c167c2de4414a11007 by Abseil Team <absl-team@google.com>: Use *opt/opt-> instead of opt.value() in an example, after checking the optional has a value. PiperOrigin-RevId: 300253502 -- 1107aa0acf0fe743ef50173e02e48f0d4eb572ef by Derek Mauro <dmauro@google.com>: Stop overriding the default system C++ dialect in CMake CMake on MacOS has some very strange defaults, like Wno-c++11-extensions, and doesn't seem to respect CMAKE_CXX_STANDARD, so use CMAKE_CXX_FLAGS instead. PiperOrigin-RevId: 300180753 GitOrigin-RevId: 66a0a46462692378f77518f9db766a218bfac40b Change-Id: Icd7b84c49306441b012cb87f244cc92a11697db8
Diffstat (limited to 'absl/base')
| -rw-r--r-- | absl/base/attributes.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/absl/base/attributes.h b/absl/base/attributes.h index ff138629d1f1..b4bb6cf873ca 100644 --- a/absl/base/attributes.h +++ b/absl/base/attributes.h @@ -507,8 +507,10 @@ // packages/targets, as this may lead to conflicting definitions of functions at // link-time. // +// XRay isn't currently supported on Android: +// https://github.com/android/ndk/issues/368 #if ABSL_HAVE_CPP_ATTRIBUTE(clang::xray_always_instrument) && \ - !defined(ABSL_NO_XRAY_ATTRIBUTES) + !defined(ABSL_NO_XRAY_ATTRIBUTES) && !defined(__ANDROID__) #define ABSL_XRAY_ALWAYS_INSTRUMENT [[clang::xray_always_instrument]] #define ABSL_XRAY_NEVER_INSTRUMENT [[clang::xray_never_instrument]] #if ABSL_HAVE_CPP_ATTRIBUTE(clang::xray_log_args) |