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

Merge "Fix header-abi-diff skips diff when config.json is not found" am: 3bf758113b am: cf474e4d59

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

Change-Id: I3dd5d77afd3f55d1a7da8e7b22d82ac92ea28db8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Mu-Le Lee
2022-08-22 15:58:08 +00:00
committed by Automerger Merge Worker
parent 28f0ca1b34 cf474e4d59
commit b5b440b045
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
vndk/tools/header-checker/src/diff/header_abi_diff.cpp
View File

@@ -213,7 +213,10 @@ bool ShouldEmitWarningMessage(CompatibilityStatusIR status) {
int main(int argc, const char **argv) { int main(int argc, const char **argv) {
llvm::cl::ParseCommandLineOptions(argc, argv, "header-checker"); llvm::cl::ParseCommandLineOptions(argc, argv, "header-checker");
ReadConfigFile(GetConfigFilePath(old_dump)); const std::string config_file_path = GetConfigFilePath(old_dump);
if (llvm::sys::fs::exists(config_file_path)) {
ReadConfigFile(config_file_path);
}
std::set<std::string> ignored_symbols; std::set<std::string> ignored_symbols;
if (llvm::sys::fs::exists(ignore_symbol_list)) { if (llvm::sys::fs::exists(ignore_symbol_list)) {

5
vndk/tools/header-checker/src/utils/config_file.cpp
View File

@@ -72,10 +72,7 @@ bool ConfigFile::Load(std::istream &istream) {
bool ConfigFile::Load(const std::string &path) { bool ConfigFile::Load(const std::string &path) {
std::ifstream stream(path); std::ifstream stream(path);
if (stream.is_open()) { return stream && Load(stream);
return Load(stream);
}
return false;
} }
} // namespace utils } // namespace utils