summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--BUILD.gn1
-rw-r--r--content/shell/BUILD.gn7
-rw-r--r--tools/imagediff/BUILD.gn20
3 files changed, 25 insertions, 3 deletions
diff --git a/BUILD.gn b/BUILD.gn
index 18af907..a29ef80 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -96,6 +96,7 @@ group("root") {
"//third_party/zlib",
"//third_party:jpeg",
"//tools/gn",
+ "//tools/imagediff($host_toolchain)",
"//ui/app_list",
"//ui/aura",
"//ui/accessibility",
diff --git a/content/shell/BUILD.gn b/content/shell/BUILD.gn
index f6e7f4f..cc60ec7 100644
--- a/content/shell/BUILD.gn
+++ b/content/shell/BUILD.gn
@@ -453,9 +453,10 @@ executable("content_shell") {
}
if (!is_android || !is_android_webview_build) {
- deps += [
- # NOTE: rely on host build of this target.
- #'../tools/imagediff/image_diff.gyp:image_diff', TODO(GYP)
+ # Some tests rely on this tool. It might be nicer if these tests relied on
+ # image diff rather than having content shell depend on it.
+ datadeps = [
+ "//tools/imagediff($host_toolchain)",
]
}
}
diff --git a/tools/imagediff/BUILD.gn b/tools/imagediff/BUILD.gn
new file mode 100644
index 0000000..887f412
--- /dev/null
+++ b/tools/imagediff/BUILD.gn
@@ -0,0 +1,20 @@
+# Copyright 2014 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+executable("imagediff") {
+ output_name = "image_diff" # Different than dir nam for historical reasons.
+ sources = [
+ "image_diff.cc",
+ "image_diff_png.h",
+ "image_diff_png.cc",
+ ]
+
+ configs += [ "//build/config/compiler:wexit_time_destructors" ]
+
+ deps = [
+ "//base",
+ "//third_party/libpng",
+ "//third_party/zlib",
+ ]
+}