From c08ebcfe530f2fff9e46483fb64349cb3f1a0c65 Mon Sep 17 00:00:00 2001 From: Yi Kong Date: Wed, 1 Mar 2023 05:24:14 +0000 Subject: [PATCH] Update clang version to clang-r487747 Change-Id: I254e4e31244599c7931a169a571f56b44d34b801 Test: presubmit Bug: 264965700 --- vndk/tools/header-checker/android/envsetup.sh | 4 ++-- .../header-checker/src/linker/header_abi_linker.cpp | 2 +- .../src/repr/symbol/version_script_parser.cpp | 4 ++-- .../header-checker/src/utils/api_level_test.cpp | 8 ++++---- .../header-checker/src/utils/string_utils_test.cpp | 12 ++++++------ 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/vndk/tools/header-checker/android/envsetup.sh b/vndk/tools/header-checker/android/envsetup.sh index 49096b6c0..44eaa1c33 100644 --- a/vndk/tools/header-checker/android/envsetup.sh +++ b/vndk/tools/header-checker/android/envsetup.sh @@ -15,5 +15,5 @@ # limitations under the License. export LLVM_BUILD_HOST_TOOLS=true -export LLVM_PREBUILTS_VERSION=clang-r475365b -export LLVM_RELEASE_VERSION=16.0.2 +export LLVM_PREBUILTS_VERSION=clang-r487747 +export LLVM_RELEASE_VERSION=17 diff --git a/vndk/tools/header-checker/src/linker/header_abi_linker.cpp b/vndk/tools/header-checker/src/linker/header_abi_linker.cpp index e877150b5..ef4186a5c 100644 --- a/vndk/tools/header-checker/src/linker/header_abi_linker.cpp +++ b/vndk/tools/header-checker/src/linker/header_abi_linker.cpp @@ -432,7 +432,7 @@ bool HeaderAbiLinker::ReadExportedSymbolsFromVersionScript() { repr::VersionScriptParser parser; parser.SetArch(arch_); - parser.SetApiLevel(api_level.getValue()); + parser.SetApiLevel(api_level.value()); for (auto &&version : excluded_symbol_versions_) { parser.AddExcludedSymbolVersion(version); } diff --git a/vndk/tools/header-checker/src/repr/symbol/version_script_parser.cpp b/vndk/tools/header-checker/src/repr/symbol/version_script_parser.cpp index 274ecd4e7..9d962d6a5 100644 --- a/vndk/tools/header-checker/src/repr/symbol/version_script_parser.cpp +++ b/vndk/tools/header-checker/src/repr/symbol/version_script_parser.cpp @@ -103,7 +103,7 @@ VersionScriptParser::ParsedTags VersionScriptParser::ParseSymbolTags( } else { if (!has_introduced_arch_tags) { result.has_introduced_tags_ = true; - result.introduced_ = intro.getValue(); + result.introduced_ = intro.value(); } } continue; @@ -117,7 +117,7 @@ VersionScriptParser::ParsedTags VersionScriptParser::ParseSymbolTags( } else { has_introduced_arch_tags = true; result.has_introduced_tags_ = true; - result.introduced_ = intro.getValue(); + result.introduced_ = intro.value(); } continue; } diff --git a/vndk/tools/header-checker/src/utils/api_level_test.cpp b/vndk/tools/header-checker/src/utils/api_level_test.cpp index c1de948aa..74f06675b 100644 --- a/vndk/tools/header-checker/src/utils/api_level_test.cpp +++ b/vndk/tools/header-checker/src/utils/api_level_test.cpp @@ -25,11 +25,11 @@ TEST(ApiLevelTest, ParseApiLevel) { EXPECT_FALSE(ParseApiLevel("")); EXPECT_FALSE(ParseApiLevel("A")); - EXPECT_TRUE(ParseApiLevel("current").hasValue()); - EXPECT_EQ(FUTURE_API_LEVEL, ParseApiLevel("current").getValue()); + EXPECT_TRUE(ParseApiLevel("current").has_value()); + EXPECT_EQ(FUTURE_API_LEVEL, ParseApiLevel("current").value()); - EXPECT_TRUE(ParseApiLevel("16").hasValue()); - EXPECT_EQ(16l, ParseApiLevel("16").getValue()); + EXPECT_TRUE(ParseApiLevel("16").has_value()); + EXPECT_EQ(16l, ParseApiLevel("16").value()); } diff --git a/vndk/tools/header-checker/src/utils/string_utils_test.cpp b/vndk/tools/header-checker/src/utils/string_utils_test.cpp index 98f25ca4c..4ad007440 100644 --- a/vndk/tools/header-checker/src/utils/string_utils_test.cpp +++ b/vndk/tools/header-checker/src/utils/string_utils_test.cpp @@ -83,14 +83,14 @@ TEST(StringUtilsTest, ParseInt) { EXPECT_FALSE(ParseInt("0xa")); EXPECT_FALSE(ParseInt("16h")); - EXPECT_TRUE(ParseInt("0").hasValue()); - EXPECT_EQ(0, ParseInt("0").getValue()); + EXPECT_TRUE(ParseInt("0").has_value()); + EXPECT_EQ(0, ParseInt("0").value()); - EXPECT_TRUE(ParseInt("16").hasValue()); - EXPECT_EQ(16, ParseInt("16").getValue()); + EXPECT_TRUE(ParseInt("16").has_value()); + EXPECT_EQ(16, ParseInt("16").value()); - EXPECT_TRUE(ParseInt("-16").hasValue()); - EXPECT_EQ(-16, ParseInt("-16").getValue()); + EXPECT_TRUE(ParseInt("-16").has_value()); + EXPECT_EQ(-16, ParseInt("-16").value()); }