summaryrefslogtreecommitdiffstats
path: root/mandoline
diff options
context:
space:
mode:
authorerg <erg@chromium.org>2015-05-29 16:12:44 -0700
committerCommit bot <commit-bot@chromium.org>2015-05-29 23:13:15 +0000
commit3e8be89d1827aed47a9deeb7d1b6745258c17000 (patch)
tree88dcc15e556517049ad99dc0f1ac4b48d5d80bb2 /mandoline
parente7fc725c370336d95752dc446631812053a21dc7 (diff)
downloadchromium_src-3e8be89d1827aed47a9deeb7d1b6745258c17000.zip
chromium_src-3e8be89d1827aed47a9deeb7d1b6745258c17000.tar.gz
chromium_src-3e8be89d1827aed47a9deeb7d1b6745258c17000.tar.bz2
Mandoline filesystem: Build the filesystem on windows.
This resolves name collisions with #defines in windows.h and does os specific path handling in a few places. BUG=490237 Review URL: https://codereview.chromium.org/1163713002 Cr-Commit-Position: refs/heads/master@{#332073}
Diffstat (limited to 'mandoline')
-rw-r--r--mandoline/BUILD.gn14
1 files changed, 5 insertions, 9 deletions
diff --git a/mandoline/BUILD.gn b/mandoline/BUILD.gn
index db023aa..2bcd2e6 100644
--- a/mandoline/BUILD.gn
+++ b/mandoline/BUILD.gn
@@ -11,11 +11,10 @@ group("all") {
]
if (!is_component_build) {
- deps += [ "//mandoline/app" ]
-
- if (!is_win) {
- deps += [ "//components/filesystem" ]
- }
+ deps += [
+ "//mandoline/app",
+ "//components/filesystem",
+ ]
}
}
@@ -29,15 +28,12 @@ group("tests") {
if (!is_component_build && !is_mac) {
deps += [
"//components/clipboard:apptests",
+ "//components/filesystem:apptests",
"//components/html_viewer:apptests",
"//components/html_viewer:tests",
"//components/resource_provider:apptests",
"//components/resource_provider:tests",
"//components/view_manager:tests",
]
-
- if (!is_win) {
- deps += [ "//components/filesystem:apptests" ]
- }
}
}