diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-11-29 20:18:40 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2022-11-29 20:18:40 +0000 |
| commit | 16f33adf3df800369df623a5fcfd434a0872168a (patch) | |
| tree | d176d97132ffb9c07d5e299f4d425aa60ce0d531 | |
| parent | 04c79e48799f93e1aed0edc7e15fb590c53c64a3 (diff) | |
| parent | c6719de4a5180be2339d06af5d03027ff83b11a4 (diff) | |
| download | base-16f33adf3df800369df623a5fcfd434a0872168a.tar.gz | |
Merge "Merge "Switch to C++20" am: a7acd5d5a7" into main-16k
| -rw-r--r-- | core/jni/Android.bp | 2 | ||||
| -rw-r--r-- | native/android/Android.bp | 1 | ||||
| -rw-r--r-- | native/android/system_fonts.cpp | 3 |
3 files changed, 3 insertions, 3 deletions
diff --git a/core/jni/Android.bp b/core/jni/Android.bp index 7cd7d2957d25..681f194d3bd3 100644 --- a/core/jni/Android.bp +++ b/core/jni/Android.bp @@ -40,6 +40,8 @@ cc_library_shared { cppflags: ["-Wno-conversion-null"], + cpp_std: "gnu++20", + srcs: [ "android_animation_PropertyValuesHolder.cpp", "android_os_SystemClock.cpp", diff --git a/native/android/Android.bp b/native/android/Android.bp index 8594ba5ca2da..f1b1d79265de 100644 --- a/native/android/Android.bp +++ b/native/android/Android.bp @@ -34,6 +34,7 @@ ndk_library { cc_defaults { name: "libandroid_defaults", + cpp_std: "gnu++20", cflags: [ "-Wall", "-Werror", diff --git a/native/android/system_fonts.cpp b/native/android/system_fonts.cpp index 9fe792958cef..8e90a6572478 100644 --- a/native/android/system_fonts.cpp +++ b/native/android/system_fonts.cpp @@ -66,9 +66,6 @@ struct AFont { return mFilePath == o.mFilePath && mLocale == o.mLocale && mWeight == o.mWeight && mItalic == o.mItalic && mCollectionIndex == o.mCollectionIndex && mAxes == o.mAxes; } - - AFont() = default; - AFont(const AFont&) = default; }; struct FontHasher { |