diff options
| author | 2022-11-30 19:45:21 +0000 | |
|---|---|---|
| committer | 2022-11-30 19:45:21 +0000 | |
| commit | 3ddd6e2774894b3c4af03e07ab1e41b89e317717 (patch) | |
| tree | c4f4ac385cf150ebb669dea062ec8d5054d3f3e9 | |
| parent | 498e07e9ca00c04ab6a3624bceb962e69d6953ea (diff) | |
| parent | 4e29c9d09b3d4ddec27475e1498c03363b8f9836 (diff) | |
Merge "Switch to C++20" am: a7acd5d5a7 am: b1dfb7b9d7 am: 4e29c9d09b
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2307908
Change-Id: I2901bb4bc990b35e3c2b0f8c264ef4d34a160d21
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -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 f140e7980f52..1bc903a191ad 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 30d0c35bcbb0..fe3132e3d2a3 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 { |