LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Revert "Update clang version to clang-r487747"" am: 7b960074f2 am: e531a63a7d am: 4b5900b1ec

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/development/+/2465672

Change-Id: Ib3d1a266aa1cf5b2d68e05c960610a803f039154
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Yi Kong
2023-03-02 11:06:44 +00:00
committed by Automerger Merge Worker
parent c71d9581b9 4b5900b1ec
commit 94ca95bb5b
5 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
vndk/tools/header-checker/android/envsetup.sh
View File

@@ -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

2
vndk/tools/header-checker/src/linker/header_abi_linker.cpp
View File

@@ -432,7 +432,7 @@ bool HeaderAbiLinker::ReadExportedSymbolsFromVersionScript() {
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);
}

4
vndk/tools/header-checker/src/repr/symbol/version_script_parser.cpp
View File

@@ -103,7 +103,7 @@ VersionScriptParser::ParsedTags VersionScriptParser::ParseSymbolTags(
} else {
if (!has_introduced_arch_tags) {
result.has_introduced_tags_ = true;
result.introduced_ = intro.value();
result.introduced_ = intro.getValue();
}
}
continue;
@@ -117,7 +117,7 @@ VersionScriptParser::ParsedTags VersionScriptParser::ParseSymbolTags(
} else {
has_introduced_arch_tags = true;
result.has_introduced_tags_ = true;
result.introduced_ = intro.value();
result.introduced_ = intro.getValue();
}
continue;
}

8
vndk/tools/header-checker/src/utils/api_level_test.cpp
View File

@@ -25,11 +25,11 @@ TEST(ApiLevelTest, ParseApiLevel) {
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());
}

12
vndk/tools/header-checker/src/utils/string_utils_test.cpp
View File

@@ -83,14 +83,14 @@ TEST(StringUtilsTest, ParseInt) {
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());
}