Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(14)

Unified Diff: BUILD.gn

Issue 2340463008: GN: support 32-bit x86 builds (Closed)
Patch Set: += Created 4 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | gn/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: BUILD.gn
diff --git a/BUILD.gn b/BUILD.gn
index 05fe3500ffdaa5335346ef07fc57f55144008bfe..46d443474f2fde881c22cdc9751f4e3f02a8e7ab 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -554,22 +554,26 @@ action("skia.h") {
]
}
-executable("fiddle") {
- include_dirs = [ "$target_gen_dir" ]
- libs = []
- if (is_linux) {
- libs += [ "OSMesa" ]
- }
+if (target_cpu == "x64") {
+ # Our bots only have 64-bit libOSMesa installed.
+ # TODO: worth fixing?
+ executable("fiddle") {
+ include_dirs = [ "$target_gen_dir" ]
+ libs = []
+ if (is_linux) {
+ libs += [ "OSMesa" ]
+ }
- sources = [
- "src/images/SkForceLinking.cpp",
- "tools/fiddle/draw.cpp",
- "tools/fiddle/fiddle_main.cpp",
- ]
- deps = [
- ":skia",
- ":skia.h",
- ]
+ sources = [
+ "src/images/SkForceLinking.cpp",
+ "tools/fiddle/draw.cpp",
+ "tools/fiddle/fiddle_main.cpp",
+ ]
+ deps = [
+ ":skia",
+ ":skia.h",
+ ]
+ }
}
# Targets guarded by skia_enable_tools may use //third_party freely.
« no previous file with comments | « no previous file | gn/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698