diff options
| author | William Escande <wescande@google.com> | 2023-06-04 23:22:52 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-06-04 23:22:52 +0000 |
| commit | 5aa3812789c7fc4130413bbba884dc9486de138e (patch) | |
| tree | a27cf37d0cbda932e117f1d44866d270eea03ef1 | |
| parent | 5d23335f54a3f55613ebe9a4e03b9f2a9852d4e9 (diff) | |
| parent | 0e10bd2e7dc7d0a22d83e5043a3279ab914aef05 (diff) | |
| download | libchrome-5aa3812789c7fc4130413bbba884dc9486de138e.tar.gz | |
Prevent spamming log for deprecated builtin am: 270953b449 am: 5136bcb5a5 am: 720656f925 am: bd3ded8ade am: dca1308008 am: 0e10bd2e7d
Original change: https://android-review.googlesource.com/c/platform/external/libchrome/+/2365437
Change-Id: Ic891ee6c7f7a1fcefbf7299696aee0edd357cdac
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 |