Merge 24Q3 (ab/11976889) to aosp-main-future
Bug: 347831320
Merged-In: Ice09a7ad54167e68cd2dc892692fc49a0afbabc1
Change-Id: Iff912f47972fa25834be8d11008ffbbe2d1ad86e
diff --git a/native/dicttoolkit/Android.bp b/native/dicttoolkit/Android.bp
index 6560d65..4ae250f 100644
--- a/native/dicttoolkit/Android.bp
+++ b/native/dicttoolkit/Android.bp
@@ -24,7 +24,6 @@
cc_defaults {
name: "dicttoolkit_defaults",
- cpp_std: "gnu++17",
cflags: [
"-Werror",
"-Wall",
diff --git a/native/dicttoolkit/tests/utils/utf8_utils_test.cpp b/native/dicttoolkit/tests/utils/utf8_utils_test.cpp
index 9c59a8b..18fa2f4 100644
--- a/native/dicttoolkit/tests/utils/utf8_utils_test.cpp
+++ b/native/dicttoolkit/tests/utils/utf8_utils_test.cpp
@@ -40,7 +40,7 @@
EXPECT_EQ('t', codePoints[3]);
}
{
- const std::vector<int> codePoints = Utf8Utils::getCodePoints(u8"\u3042a\u03C2\u0410");
+ const std::vector<int> codePoints = Utf8Utils::getCodePoints("\u3042a\u03C2\u0410");
EXPECT_EQ(4u, codePoints.size());
EXPECT_EQ(0x3042, codePoints[0]); // HIRAGANA LETTER A
EXPECT_EQ('a', codePoints[1]);
@@ -48,7 +48,7 @@
EXPECT_EQ(0x0410, codePoints[3]); // GREEK SMALL LETTER FINAL SIGMA
}
{
- const std::vector<int> codePoints = Utf8Utils::getCodePoints(u8"\U0001F36A?\U0001F752");
+ const std::vector<int> codePoints = Utf8Utils::getCodePoints("\U0001F36A?\U0001F752");
EXPECT_EQ(3u, codePoints.size());
EXPECT_EQ(0x1F36A, codePoints[0]); // COOKIE
EXPECT_EQ('?', codePoints[1]);
@@ -75,7 +75,7 @@
0x1F36A /* COOKIE */,
0x1F752 /* ALCHEMICAL SYMBOL FOR STARRED TRIDENT */
};
- EXPECT_EQ(u8"\u00E0\u03C2\u0430\u3042\U0001F36A\U0001F752",
+ EXPECT_EQ("\u00E0\u03C2\u0430\u3042\U0001F36A\U0001F752",
Utf8Utils::getUtf8String(CodePointArrayView(codePoints)));
}
}