summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--BUILD.gn7
-rw-r--r--third_party/codesighs/BUILD.gn54
-rw-r--r--tools/telemetry/BUILD.gn9
-rw-r--r--tools/telemetry/telemetry/core/bitmaptools.cc4
4 files changed, 72 insertions, 2 deletions
diff --git a/BUILD.gn b/BUILD.gn
index 6f9777b..c03435e 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -8,6 +8,7 @@
# you add a new build file, there must be some path of dependencies from this
# file to your new one or GN won't know about it.
+import("//build/config/features.gni")
import("//build/config/ui.gni")
if (is_android) {
import("//build/config/android/config.gni")
@@ -83,6 +84,7 @@ group("root") {
"//third_party/cacheinvalidation",
"//third_party/cld",
"//third_party/cld_2",
+ "//third_party/codesighs",
"//third_party/ffmpeg",
"//third_party/flac",
"//third_party/harfbuzz-ng",
@@ -118,6 +120,7 @@ group("root") {
"//third_party:jpeg",
"//tools/gn",
"//tools/imagediff($host_toolchain)",
+ "//tools/telemetry:bitmaptools",
"//ui/accessibility",
"//ui/app_list",
"//ui/aura",
@@ -141,6 +144,10 @@ group("root") {
]
deps += root_extra_deps
+ if (enable_extensions) {
+ deps += [ "//extensions/shell:app_shell_unittests" ]
+ }
+
if (!is_win) {
deps += [ "//breakpad:symupload" ]
}
diff --git a/third_party/codesighs/BUILD.gn b/third_party/codesighs/BUILD.gn
new file mode 100644
index 0000000..6706e3bc
--- /dev/null
+++ b/third_party/codesighs/BUILD.gn
@@ -0,0 +1,54 @@
+# 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("codesighs") {
+ sources = [
+ "codesighs.c",
+ ]
+
+ configs -= [ "//build/config/compiler:chromium_code" ]
+ configs += [ "//build/config/compiler:no_chromium_code" ]
+}
+
+executable("maptsvdifftool") {
+ sources = [
+ "maptsvdifftool.c",
+ ]
+
+ configs -= [ "//build/config/compiler:chromium_code" ]
+ configs += [ "//build/config/compiler:no_chromium_code" ]
+}
+
+if (is_win) {
+ executable("msmap2tsv") {
+ sources = [
+ "msmap2tsv.c",
+ ]
+
+ libs += [ "dbghelp.lib" ]
+
+ configs -= [ "//build/config/compiler:chromium_code" ]
+ configs += [ "//build/config/compiler:no_chromium_code" ]
+ }
+
+ executable("msdump2symdb") {
+ sources = [
+ "msdump2symdb.c",
+ ]
+
+ configs -= [ "//build/config/compiler:chromium_code" ]
+ configs += [ "//build/config/compiler:no_chromium_code" ]
+ }
+} else {
+ executable("nm2tsv") {
+ sources = [
+ "nm2tsv.c",
+ ]
+
+ configs -= [ "//build/config/compiler:chromium_code" ]
+ configs += [ "//build/config/compiler:no_chromium_code" ]
+ }
+}
diff --git a/tools/telemetry/BUILD.gn b/tools/telemetry/BUILD.gn
new file mode 100644
index 0000000..638f288
--- /dev/null
+++ b/tools/telemetry/BUILD.gn
@@ -0,0 +1,9 @@
+# Copyright 2015 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("bitmaptools") {
+ sources = [
+ "telemetry/core/bitmaptools.cc",
+ ]
+}
diff --git a/tools/telemetry/telemetry/core/bitmaptools.cc b/tools/telemetry/telemetry/core/bitmaptools.cc
index ba4a8a5..7a335da 100644
--- a/tools/telemetry/telemetry/core/bitmaptools.cc
+++ b/tools/telemetry/telemetry/core/bitmaptools.cc
@@ -237,8 +237,8 @@ int main() {
_setmode(_fileno(stdin), _O_BINARY);
_setmode(_fileno(stdout), _O_BINARY);
#else
- FILE* unused_stdin = freopen(NULL, "rb", stdin);
- FILE* unused_stdout = freopen(NULL, "wb", stdout);
+ static_cast<void>(freopen(NULL, "rb", stdin));
+ static_cast<void>(freopen(NULL, "wb", stdout));
#endif
if (!bmp.Read()) return -1;