Commit 3007e94b authored by Ramin Halavati's avatar Ramin Halavati Committed by Commit Bot

Update traffic annotation auditor's switches path.

Traffic annotation auditor's clang tool switches path is changed to
absolute path, and data dependency on it is corrected.

TBR=msramek@chromium.org

Bug: 690323
Change-Id: If3dd10339745c601d6a4e4d077b5251defe37af6
Reviewed-on: https://chromium-review.googlesource.com/999612Reviewed-by: default avatarRamin Halavati <rhalavati@chromium.org>
Reviewed-by: default avatarMartin Šrámek <msramek@chromium.org>
Commit-Queue: Ramin Halavati <rhalavati@chromium.org>
Cr-Commit-Position: refs/heads/master@{#548751}
parent 91dc1b58
...@@ -61,6 +61,7 @@ source_set("auditor_sources") { ...@@ -61,6 +61,7 @@ source_set("auditor_sources") {
] ]
data = [ data = [
"safe_list.txt", "safe_list.txt",
"traffic_annotation_extractor_switches.txt",
] ]
public_deps = [ public_deps = [
......
...@@ -115,8 +115,10 @@ TrafficAnnotationAuditor::TrafficAnnotationAuditor( ...@@ -115,8 +115,10 @@ TrafficAnnotationAuditor::TrafficAnnotationAuditor(
DCHECK(!build_path.empty()); DCHECK(!build_path.empty());
DCHECK(!clang_tool_path.empty()); DCHECK(!clang_tool_path.empty());
base::FilePath switches_file =
base::MakeAbsoluteFilePath(source_path_.Append(kClangToolSwitchesPath));
std::string file_content; std::string file_content;
if (base::ReadFileToString(kClangToolSwitchesPath, &file_content)) { if (base::ReadFileToString(switches_file, &file_content)) {
clang_tool_switches_ = base::SplitString( clang_tool_switches_ = base::SplitString(
file_content, "\n", base::TRIM_WHITESPACE, base::SPLIT_WANT_NONEMPTY); file_content, "\n", base::TRIM_WHITESPACE, base::SPLIT_WANT_NONEMPTY);
} else { } else {
......
...@@ -73,5 +73,4 @@ and land the resulting CL. ...@@ -73,5 +73,4 @@ and land the resulting CL.
The following two lines will be updated by the above script, and the modified The following two lines will be updated by the above script, and the modified
README should be committed along with the updated .sha1 checksums. README should be committed along with the updated .sha1 checksums.
CLANG_REVISION = '328716' LASTCHANGE=1b08944149719c77799148b275de114f3a9e0bc1-refs/heads/master@{#548701}
LASTCHANGE=71d65441b6c5409be898a817066b60d063380aa9-refs/heads/master@{#547990}
\ No newline at end of file
f0cb9572c4457607bf510bbb8e73ca7112110991 6a56dcc2fc9b5a93926f853605e118de3e71a98f
\ No newline at end of file \ No newline at end of file
dd8213fb7861df8f388b5929aa796f24fe9b64a3 3e449720dfd7a23747f7320a57db3451fb751c56
\ No newline at end of file \ No newline at end of file
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment