commit a7acd5d5a7aa273be82972d5663c5fe2242e66c2
author Bart Van Assche <bvanassche@google.com> Tue Nov 29 19:44:05 2022 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Nov 29 19:44:05 2022 +0000
tree d176d97132ffb9c07d5e299f4d425aa60ce0d531
parent a6971bc969b5e30d7378507ac0e5f2227f8ee650
parent b66923ab2d0deb82ca35dcdcb7f577bb0b887372

Merge "Switch to C++20"

core/jni/Android.bp

diff --git a/core/jni/Android.bp b/core/jni/Android.bp
index 7cd7d29..681f194 100644
--- a/core/jni/Android.bp
+++ b/core/jni/Android.bp
@@ -40,6 +40,8 @@
 
     cppflags: ["-Wno-conversion-null"],
 
+    cpp_std: "gnu++20",
+
     srcs: [
         "android_animation_PropertyValuesHolder.cpp",
         "android_os_SystemClock.cpp",

native/android/Android.bp

diff --git a/native/android/Android.bp b/native/android/Android.bp
index 8594ba5..f1b1d79 100644
--- a/native/android/Android.bp
+++ b/native/android/Android.bp
@@ -34,6 +34,7 @@
 
 cc_defaults {
     name: "libandroid_defaults",
+    cpp_std: "gnu++20",
     cflags: [
         "-Wall",
         "-Werror",

native/android/system_fonts.cpp

diff --git a/native/android/system_fonts.cpp b/native/android/system_fonts.cpp
index 9fe7929..8e90a65 100644
--- a/native/android/system_fonts.cpp
+++ b/native/android/system_fonts.cpp
@@ -66,9 +66,6 @@
         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 {