Merge "Switch to C++20" am: a7acd5d5a7
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2307908 Change-Id: I06ab1e1d7a9db21f14ac33f2eebf84ef6875d02f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -40,6 +40,8 @@ cc_library_shared {
|
||||
|
||||
cppflags: ["-Wno-conversion-null"],
|
||||
|
||||
cpp_std: "gnu++20",
|
||||
|
||||
srcs: [
|
||||
"android_animation_PropertyValuesHolder.cpp",
|
||||
"android_os_SystemClock.cpp",
|
||||
|
||||
@@ -34,6 +34,7 @@ ndk_library {
|
||||
|
||||
cc_defaults {
|
||||
name: "libandroid_defaults",
|
||||
cpp_std: "gnu++20",
|
||||
cflags: [
|
||||
"-Wall",
|
||||
"-Werror",
|
||||
|
||||
@@ -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 {
|
||||
|
||||
Reference in New Issue
Block a user