Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Switch to C++20"

Browse Source
This commit is contained in:
Bart Van Assche
2022-11-29 19:44:05 +00:00
committed by Gerrit Code Review
parent a6971bc969 b66923ab2d
commit a7acd5d5a7
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/jni/Android.bp
View File

@@ -40,6 +40,8 @@ cc_library_shared {
cppflags: ["-Wno-conversion-null"], cppflags: ["-Wno-conversion-null"],
cpp_std: "gnu++20",
srcs: [ srcs: [
"android_animation_PropertyValuesHolder.cpp", "android_animation_PropertyValuesHolder.cpp",
"android_os_SystemClock.cpp", "android_os_SystemClock.cpp",

1
native/android/Android.bp
View File

@@ -34,6 +34,7 @@ ndk_library {
cc_defaults { cc_defaults {
name: "libandroid_defaults", name: "libandroid_defaults",
cpp_std: "gnu++20",
cflags: [ cflags: [
"-Wall", "-Wall",
"-Werror", "-Werror",

3
native/android/system_fonts.cpp
View File

@@ -66,9 +66,6 @@ struct AFont {
return mFilePath == o.mFilePath && mLocale == o.mLocale && mWeight == o.mWeight && return mFilePath == o.mFilePath && mLocale == o.mLocale && mWeight == o.mWeight &&
mItalic == o.mItalic && mCollectionIndex == o.mCollectionIndex && mAxes == o.mAxes; mItalic == o.mItalic && mCollectionIndex == o.mCollectionIndex && mAxes == o.mAxes;
} }
AFont() = default;
AFont(const AFont&) = default;
}; };
struct FontHasher { struct FontHasher {