diff options
| -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 | ||||
| -rw-r--r-- | services/OWNERS | 2 |
4 files changed, 4 insertions, 4 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 { diff --git a/services/OWNERS b/services/OWNERS index 495c0737e599..eace9060277d 100644 --- a/services/OWNERS +++ b/services/OWNERS @@ -3,7 +3,7 @@ per-file Android.bp = file:platform/build/soong:/OWNERS #{LAST_RESORT_SUGGESTION # art-team@ manages the system server profile per-file art-profile* = calin@google.com, ngeoffray@google.com, vmarko@google.com -per-file java/com/android/server/* = toddke@google.com,patb@google.com +per-file java/com/android/server/* = patb@google.com #{LAST_RESORT_SUGGESTION} per-file tests/servicestests/src/com/android/server/systemconfig/* = patb@google.com per-file proguard.flags = jdduke@google.com |