diff options
| author | brettw <brettw@chromium.org> | 2015-07-16 17:07:49 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-07-17 00:09:29 +0000 |
| commit | abc0faae61c7b13c9e98a28f183b688d09142795 (patch) | |
| tree | 6e9836ea2b09e77ebab285bdb55328dcac5937e0 | |
| parent | c41a003c834c0605e271aa6061b046a776940b86 (diff) | |
| download | chromium_src-abc0faae61c7b13c9e98a28f183b688d09142795.zip chromium_src-abc0faae61c7b13c9e98a28f183b688d09142795.tar.gz chromium_src-abc0faae61c7b13c9e98a28f183b688d09142795.tar.bz2 | |
Pull buildtools to get GN 338735.
Fix duplicate source file in removing/base/BUILD.gn
TBR=dpranke@chromium.org
Review URL: https://codereview.chromium.org/1242523003
Cr-Commit-Position: refs/heads/master@{#339182}
| -rw-r--r-- | DEPS | 2 | ||||
| -rw-r--r-- | remoting/base/BUILD.gn | 1 |
2 files changed, 1 insertions, 2 deletions
@@ -50,7 +50,7 @@ vars = { # Three lines of non-changing comments so that # the commit queue can handle CLs rolling build tools # and whatever else without interference from each other. - 'buildtools_revision': '5215ee866bc3e8eb4a7f124212845abf4029e60b', + 'buildtools_revision': '125d157607de4d7c95bf8b02dd580aae17962f19', # Three lines of non-changing comments so that # the commit queue can handle CLs rolling PDFium # and whatever else without interference from each other. diff --git a/remoting/base/BUILD.gn b/remoting/base/BUILD.gn index 6853315..a8f06a2 100644 --- a/remoting/base/BUILD.gn +++ b/remoting/base/BUILD.gn @@ -82,7 +82,6 @@ source_set("unit_tests") { ] if (is_win || is_mac || is_chromeos) { - sources += [ "resources_unittest.cc" ] deps += [ "//breakpad:client" ] } |