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

Merge "temporarily disable FORTIFY in header-abi-dumper"

Browse Source
This commit is contained in:
Treehugger Robot
2017-03-13 22:35:14 +00:00
committed by Gerrit Code Review
parent edaab1ab96 7fef90146b
commit 1e7c8fe0da
1 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
vndk/tools/header-checker/header-abi-dumper/src/header_checker.cpp
View File

@@ -61,13 +61,23 @@ static void HideIrrelevantCommandLineOptions() {
int main(int argc, const char **argv) { int main(int argc, const char **argv) {
HideIrrelevantCommandLineOptions(); HideIrrelevantCommandLineOptions();
// FIXME: Clang FORTIFY requires a version of clang at least as new as
// clang-3688880 (r285906). Since external/clang is currently r275480, we need
// to disable FORTIFY for this tool to function correctly.
std::vector<const char *> fixedArgv(argv, argv + argc);
fixedArgv.push_back("-U_FORTIFY_SOURCE");
int fixedArgc = fixedArgv.size();
// Create compilation database from command line arguments after "--". // Create compilation database from command line arguments after "--".
std::unique_ptr<clang::tooling::CompilationDatabase> compilations( std::unique_ptr<clang::tooling::CompilationDatabase> compilations(
clang::tooling::FixedCompilationDatabase::loadFromCommandLine( clang::tooling::FixedCompilationDatabase::loadFromCommandLine(
argc, argv)); fixedArgc, fixedArgv.data()));
// Parse the command line options. // Parse the command line options.
llvm::cl::ParseCommandLineOptions(argc, argv, "header-checker"); // Note that loadFromCommandLine may alter fixedArgc, so we can't use
// fixedArgv.size() here.
llvm::cl::ParseCommandLineOptions(fixedArgc, fixedArgv.data(),
"header-checker");
// Input header file existential check. // Input header file existential check.
if (!llvm::sys::fs::exists(header_file)) { if (!llvm::sys::fs::exists(header_file)) {