Revert "Update clang version to clang-r487747"
Revert submission 2462733-fix-clang-tools-r487747
Rollback compiler update
Reverted changes: /q/submissionid:2462733-fix-clang-tools-r487747
Change-Id: I728d075c70c1a9938475069643c62a2cdf2a968f
(cherry picked from commit 78eb9e45d8eb8405c1a2f9f508ff4a88633d510a)
Merged-In: I728d075c70c1a9938475069643c62a2cdf2a968f
diff --git a/vndk/tools/header-checker/android/envsetup.sh b/vndk/tools/header-checker/android/envsetup.sh
index 44eaa1c..49096b6 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-r487747
-export LLVM_RELEASE_VERSION=17
+export LLVM_PREBUILTS_VERSION=clang-r475365b
+export LLVM_RELEASE_VERSION=16.0.2
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 ef4186a..e877150 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 @@
repr::VersionScriptParser parser;
parser.SetArch(arch_);
- parser.SetApiLevel(api_level.value());
+ parser.SetApiLevel(api_level.getValue());
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 9d962d6..274ecd4 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 @@
} else {
if (!has_introduced_arch_tags) {
result.has_introduced_tags_ = true;
- result.introduced_ = intro.value();
+ result.introduced_ = intro.getValue();
}
}
continue;
@@ -117,7 +117,7 @@
} else {
has_introduced_arch_tags = true;
result.has_introduced_tags_ = true;
- result.introduced_ = intro.value();
+ result.introduced_ = intro.getValue();
}
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 74f0667..c1de948 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 @@
EXPECT_FALSE(ParseApiLevel(""));
EXPECT_FALSE(ParseApiLevel("A"));
- EXPECT_TRUE(ParseApiLevel("current").has_value());
- EXPECT_EQ(FUTURE_API_LEVEL, ParseApiLevel("current").value());
+ EXPECT_TRUE(ParseApiLevel("current").hasValue());
+ EXPECT_EQ(FUTURE_API_LEVEL, ParseApiLevel("current").getValue());
- EXPECT_TRUE(ParseApiLevel("16").has_value());
- EXPECT_EQ(16l, ParseApiLevel("16").value());
+ EXPECT_TRUE(ParseApiLevel("16").hasValue());
+ EXPECT_EQ(16l, ParseApiLevel("16").getValue());
}
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 4ad0074..98f25ca 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 @@
EXPECT_FALSE(ParseInt("0xa"));
EXPECT_FALSE(ParseInt("16h"));
- EXPECT_TRUE(ParseInt("0").has_value());
- EXPECT_EQ(0, ParseInt("0").value());
+ EXPECT_TRUE(ParseInt("0").hasValue());
+ EXPECT_EQ(0, ParseInt("0").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());
+ EXPECT_TRUE(ParseInt("-16").hasValue());
+ EXPECT_EQ(-16, ParseInt("-16").getValue());
}
