summaryrefslogtreecommitdiffstats
path: root/BUILD.gn
diff options
context:
space:
mode:
authorsdefresne <sdefresne@chromium.org>2016-03-25 17:06:26 -0700
committerCommit bot <commit-bot@chromium.org>2016-03-26 00:07:47 +0000
commit3bdd5635f4dba38c3035fe992039a833988e147b (patch)
tree83ec0f14deaddad3ff8bb3062300222f993ea894 /BUILD.gn
parent2edf9869450cdd9337eab5bc92623a0f074cc7ed (diff)
downloadchromium_src-3bdd5635f4dba38c3035fe992039a833988e147b.zip
chromium_src-3bdd5635f4dba38c3035fe992039a833988e147b.tar.gz
chromium_src-3bdd5635f4dba38c3035fe992039a833988e147b.tar.bz2
[iOS/GN] Fix compilation of ios_chrome_unittests with gn.
Get GN in sync with gyp by adding missing dependencies, removing the obsoletes dependencies and adding missing files and targets. Change the toolchain when targetting iOS devices to not build fat binaries as this break the "gn gen"-time selection of the level of optimisation to use from skia and libwebp. Instead, building for devices on iOS is now similar to other platforms (i.e. the arch is selected via "target_cpu" with "arm" an alias for "armv7"). Fixes the following errors: Undefined symbols for architecture arm64: "_VP8DspInitNEON", referenced from: _VP8DspInit in dec.o ... BUG=459705,596237 Review URL: https://codereview.chromium.org/1810423002 Cr-Commit-Position: refs/heads/master@{#383416}
Diffstat (limited to 'BUILD.gn')
-rw-r--r--BUILD.gn6
1 files changed, 3 insertions, 3 deletions
diff --git a/BUILD.gn b/BUILD.gn
index 35133fd..73d151a 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -197,9 +197,9 @@ group("both_gn_and_gyp") {
]
} else {
deps += [
- #"//ios/chrome:ios_chrome_unittests", TODO(GYP)
- #"//ios/chrome/app", TODO(GYP)
- #"//ios/chrome/browser", TODO(GYP)
+ "//ios/chrome:ios_chrome_unittests",
+ "//ios/chrome/app",
+ "//ios/chrome/browser",
"//ios/chrome/common",
"//ios/net:ios_net_unittests",
"//ios/public/provider/chrome/browser",