diff options
| author | pmonette <pmonette@chromium.org> | 2016-01-07 16:21:16 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-01-08 00:22:31 +0000 |
| commit | 502a83e013988cb8202844650e0e423ec2d8ee78 (patch) | |
| tree | bec66a12ca8a6b9edd9a657431db9e1f94ba7adf /components/crash | |
| parent | ab0c1304c9f3b0c248f154680db5449f1a5497c8 (diff) | |
| download | chromium_src-502a83e013988cb8202844650e0e423ec2d8ee78.zip chromium_src-502a83e013988cb8202844650e0e423ec2d8ee78.tar.gz chromium_src-502a83e013988cb8202844650e0e423ec2d8ee78.tar.bz2 | |
Switched Kasko to use the new buildflag system.
Moved gyp build to third_party/kasko
Also fixed some build issues that came with rebasing to tip of tree.
Review URL: https://codereview.chromium.org/1526213002
Cr-Commit-Position: refs/heads/master@{#368212}
Diffstat (limited to 'components/crash')
| -rw-r--r-- | components/crash/content/app/BUILD.gn | 1 | ||||
| -rw-r--r-- | components/crash/content/app/DEPS | 1 | ||||
| -rw-r--r-- | components/crash/content/app/crashpad.cc | 4 | ||||
| -rw-r--r-- | components/crash/content/app/crashpad.h | 9 |
4 files changed, 9 insertions, 6 deletions
diff --git a/components/crash/content/app/BUILD.gn b/components/crash/content/app/BUILD.gn index 474b2f2..52140ce 100644 --- a/components/crash/content/app/BUILD.gn +++ b/components/crash/content/app/BUILD.gn @@ -41,6 +41,7 @@ source_set("app") { public_deps = [ ":app_non_mac_win", + "//third_party/kasko", ] deps = [ "//base", diff --git a/components/crash/content/app/DEPS b/components/crash/content/app/DEPS index dc5e932..80bc21a 100644 --- a/components/crash/content/app/DEPS +++ b/components/crash/content/app/DEPS @@ -4,5 +4,6 @@ include_rules = [ "+content/public/common/content_descriptors.h", "+content/public/common/result_codes.h", "+third_party/crashpad", + "+third_party/kasko", "+third_party/lss/linux_syscall_support.h", ] diff --git a/components/crash/content/app/crashpad.cc b/components/crash/content/app/crashpad.cc index 19a363634..dfe83ca 100644 --- a/components/crash/content/app/crashpad.cc +++ b/components/crash/content/app/crashpad.cc @@ -243,7 +243,7 @@ void GetUploadedReports(std::vector<UploadedReport>* uploaded_reports) { }); } -#if defined(KASKO) +#if BUILDFLAG(ENABLE_KASKO) void GetCrashKeysForKasko(std::vector<kasko::api::CrashKey>* crash_keys) { // Reserve room for an extra key, the guid. @@ -282,7 +282,7 @@ void GetCrashKeysForKasko(std::vector<kasko::api::CrashKey>* crash_keys) { } } -#endif // KASKO +#endif // BUILDFLAG(ENABLE_KASKO) } // namespace crash_reporter diff --git a/components/crash/content/app/crashpad.h b/components/crash/content/app/crashpad.h index 59bc5d6..1f9f007 100644 --- a/components/crash/content/app/crashpad.h +++ b/components/crash/content/app/crashpad.h @@ -11,10 +11,11 @@ #include <vector> #include "base/files/file_path.h" +#include "third_party/kasko/kasko_features.h" -#if defined(KASKO) +#if BUILDFLAG(ENABLE_KASKO) #include "syzygy/kasko/api/crash_key.h" -#endif // KASKO +#endif // BUILDFLAG(ENABLE_KASKO) namespace crash_reporter { @@ -74,10 +75,10 @@ struct UploadedReport { // disabled. void GetUploadedReports(std::vector<UploadedReport>* uploaded_reports); -#if defined(KASKO) +#if BUILDFLAG(ENABLE_KASKO) // Returns a copy of the current crash keys for Kasko. void GetCrashKeysForKasko(std::vector<kasko::api::CrashKey>* crash_keys); -#endif // KASKO +#endif // BUILDFLAG(ENABLE_KASKO) namespace internal { |