diff options
| author | pmonette <pmonette@chromium.org> | 2016-02-10 15:00:59 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-02-10 23:02:31 +0000 |
| commit | 4745047a22b69623a37e3fece56c2c07a3398602 (patch) | |
| tree | e7a636d07982638dc8b634d40506719da002efba | |
| parent | a2f1ff976845da38f13efaec18aead3f04142ac7 (diff) | |
| download | chromium_src-4745047a22b69623a37e3fece56c2c07a3398602.zip chromium_src-4745047a22b69623a37e3fece56c2c07a3398602.tar.gz chromium_src-4745047a22b69623a37e3fece56c2c07a3398602.tar.bz2 | |
Fix the Kasko GN build.
Review URL: https://codereview.chromium.org/1685233002
Cr-Commit-Position: refs/heads/master@{#374765}
| -rw-r--r-- | chrome/chrome_watcher/BUILD.gn | 1 | ||||
| -rwxr-xr-x | chrome/test/kasko/hang_watcher_integration_test.py | 15 | ||||
| -rw-r--r-- | components/crash/content/app/BUILD.gn | 1 |
3 files changed, 12 insertions, 5 deletions
diff --git a/chrome/chrome_watcher/BUILD.gn b/chrome/chrome_watcher/BUILD.gn index e7b793a..c31088f 100644 --- a/chrome/chrome_watcher/BUILD.gn +++ b/chrome/chrome_watcher/BUILD.gn @@ -37,6 +37,7 @@ shared_library("chrome_watcher") { "//build/config/sanitizers:deps", "//chrome/installer/util:with_no_strings", "//components/browser_watcher", + "//components/crash/content/app", "//third_party/kasko", ] ldflags = [ "/DEF:" + rebase_path("chrome_watcher.def", root_build_dir) ] diff --git a/chrome/test/kasko/hang_watcher_integration_test.py b/chrome/test/kasko/hang_watcher_integration_test.py index 345a240..b6064fe 100755 --- a/chrome/test/kasko/hang_watcher_integration_test.py +++ b/chrome/test/kasko/hang_watcher_integration_test.py @@ -14,13 +14,20 @@ of Chrome with Chrome branding, and attempting to use it with anything else will most likely lead to constant failures. Typical usage (assuming in root 'src' directory): - -- generate project files with the following GYP variables: - branding=Chrome kasko=1 kasko_hang_reports=1 +- generate project files with the following build variables: + GYP variables: + branding=Chrome kasko=1 kasko_hang_reports=1 + GN variables: + target_cpu = "x86" + is_debug = false + is_chrome_branded = true + enable_kasko = true + enable_kasko_hang_reports = true - build the release Chrome binaries: - ninja -C out\Release chrome.exe chromedriver.exe + ninja -C {build_dir} chrome.exe chromedriver.exe - run the test: python chrome/test/kasko/hang_watcher_integration_test.py + --chrome={build_dir}\chrome.exe """ import logging diff --git a/components/crash/content/app/BUILD.gn b/components/crash/content/app/BUILD.gn index d6f9fb7..87875e5 100644 --- a/components/crash/content/app/BUILD.gn +++ b/components/crash/content/app/BUILD.gn @@ -49,7 +49,6 @@ source_set("app") { ] deps = [ "//base", - "//third_party/kasko", ] deps += [ ":lib" ] |