summaryrefslogtreecommitdiffstats
path: root/chrome/tools
diff options
context:
space:
mode:
authorBrett Wilson <brettw@chromium.org>2014-11-10 09:45:30 -0800
committerBrett Wilson <brettw@chromium.org>2014-11-10 17:46:17 +0000
commit32ce17ab53d97a66e50e7e49ef57e8fa9f881714 (patch)
tree85f7bfbaa0ef4559bfaf16fd79c71dd7050d19f9 /chrome/tools
parentbca16df006443ffcb52bd4d514f823ca6cb51453 (diff)
downloadchromium_src-32ce17ab53d97a66e50e7e49ef57e8fa9f881714.zip
chromium_src-32ce17ab53d97a66e50e7e49ef57e8fa9f881714.tar.gz
chromium_src-32ce17ab53d97a66e50e7e49ef57e8fa9f881714.tar.bz2
Add chrome perf tests to GN build, fix harfbuzz
This also hooks up the chrome test support target which was previously not compiled (the file wasn't referenced). This duplicates the harfbuzz logic from the GYP build where the system one is conditionally used if the pangoft2 version is sufficiently large. There are some additions to the pkg-config wrapper script to check versions. Write a service_discovery_sniffer target but don't hook it up. Currently this gives linker errors. Fix grit warnings for the remoting resources. R=dpranke@chromium.org Review URL: https://codereview.chromium.org/702903004 Cr-Commit-Position: refs/heads/master@{#303489}
Diffstat (limited to 'chrome/tools')
-rw-r--r--chrome/tools/BUILD.gn13
-rw-r--r--chrome/tools/service_discovery_sniffer/BUILD.gn25
2 files changed, 38 insertions, 0 deletions
diff --git a/chrome/tools/BUILD.gn b/chrome/tools/BUILD.gn
new file mode 100644
index 0000000..0adca4b
--- /dev/null
+++ b/chrome/tools/BUILD.gn
@@ -0,0 +1,13 @@
+# 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.
+
+# This target just provides references to the Chrome tools to bring them into
+# the build.
+group("tools") {
+ testonly = true
+ deps = [
+ # TODO(GYP) re-enable this. Currently it's giving linker errors about Mojo.
+ #"//chrome/tools/service_discovery_sniffer",
+ ]
+}
diff --git a/chrome/tools/service_discovery_sniffer/BUILD.gn b/chrome/tools/service_discovery_sniffer/BUILD.gn
new file mode 100644
index 0000000..91c3bee
--- /dev/null
+++ b/chrome/tools/service_discovery_sniffer/BUILD.gn
@@ -0,0 +1,25 @@
+# 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.
+
+import("//build/config/features.gni")
+
+executable("service_discovery_sniffer") {
+ testonly = true
+ sources = [
+ "service_discovery_sniffer.cc",
+ "service_discovery_sniffer.h",
+ ]
+
+ deps = [
+ "//base",
+ "//base/allocator",
+ "//base/test:test_support",
+ "//chrome/utility",
+ "//net",
+ ]
+
+ if (enable_webrtc) {
+ deps += [ "//third_party/libjingle:libjingle_webrtc" ]
+ }
+}