diff options
| author | William Escande <wescande@google.com> | 2023-06-04 20:03:36 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-06-04 20:03:36 +0000 |
| commit | 5136bcb5a5a555417dca3b9af82eb4d9870d5d3d (patch) | |
| tree | a27cf37d0cbda932e117f1d44866d270eea03ef1 | |
| parent | bd8fe4d9757c0a12404b07016bf9ba9fb21d9f0c (diff) | |
| parent | 270953b4499f462f6a880101ee61c9a0b3e1ecb5 (diff) | |
| download | libchrome-5136bcb5a5a555417dca3b9af82eb4d9870d5d3d.tar.gz | |
Prevent spamming log for deprecated builtin am: 270953b449
Original change: https://android-review.googlesource.com/c/platform/external/libchrome/+/2365437
Change-Id: Ieecd0ec9247921bbff05351299e4086475903480
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | base/template_util.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/base/template_util.h b/base/template_util.h index 8544aa2945..e4d03a24c3 100644 --- a/base/template_util.h +++ b/base/template_util.h @@ -22,8 +22,9 @@ // you attempt to mix an earlier version of libstdc++ with >= GCC5. But // that's unlikely to work out, especially as GCC5 changed ABI. #define CR_GLIBCXX_5_0_0 20150123 -#if (defined(__GNUC__) && __GNUC__ < 5) || \ - (defined(__GLIBCXX__) && __GLIBCXX__ == CR_GLIBCXX_5_0_0) +// `!defined(__clang__)` is a local android patch +#if !defined(__clang__) && ((defined(__GNUC__) && __GNUC__ < 5) || \ + (defined(__GLIBCXX__) && __GLIBCXX__ == CR_GLIBCXX_5_0_0)) #define CR_USE_FALLBACKS_FOR_OLD_EXPERIMENTAL_GLIBCXX #endif |