diff options
| author | thakis <thakis@chromium.org> | 2014-09-05 17:07:47 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-09-06 00:23:15 +0000 |
| commit | 3f1281e5b0f2d2f8a8d8bd17a108f6ed0c9c7d7f (patch) | |
| tree | b19dcbff3ffd92d3482e85b4d913e8860b590bef /ui/base | |
| parent | bd54da791fd09ab07b2480e328da4430ff792e5e (diff) | |
| download | chromium_src-3f1281e5b0f2d2f8a8d8bd17a108f6ed0c9c7d7f.zip chromium_src-3f1281e5b0f2d2f8a8d8bd17a108f6ed0c9c7d7f.tar.gz chromium_src-3f1281e5b0f2d2f8a8d8bd17a108f6ed0c9c7d7f.tar.bz2 | |
Revert of Make ui gn check pass. Misc GN build improvements. (patchset #3 id:40001 of https://codereview.chromium.org/545313002/)
Reason for revert:
Broke http://build.chromium.org/p/chromium.linux/builders/Linux%20GN%20%28dbg%29/builds/11835
[783/786 | 258.324] LINK ./chrome
FAILED: /mnt/data/b/build/goma/gomacc ../../third_party/llvm-build/Release+Asserts/bin/clang++ -Wl,--fatal-warnings -m64 -fPIC -Wl,-z,noexecstack -Wl,-z,now -Wl,-z,relro -pthread -B../../third_party/binutils/Linux_x64/Release/bin -fuse-ld=gold -Wl,--icf=none -Wl,-rpath=\$ORIGIN/ -Wl,-rpath-link= -Wl,--disable-new-dtags -o ./keyboard_unittests -Wl,--start-group @./keyboard_unittests.rsp -Wl,--end-group -ldl -lgmodule-2.0 -lgobject-2.0 -lgthread-2.0 -lrt -lglib-2.0 -ludev -lfontconfig -lX11 -lXcomposite -lXcursor -lXdamage -lXext -lXfixes -lXi -lXrender -lXss -lXtst -lpangocairo-1.0 -lpango-1.0 -lcairo -lnss3 -lnssutil3 -lsmime3 -lplds4 -lplc4 -lnspr4 -lgconf-2 -lresolv -lfreetype -lasound -lXrandr -lcups -lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err -lgcrypt -lz -lpthread -lcrypt -lm -lcap -ldbus-1 -lcrypto -lexpat
../../content/utility/utility_thread_impl.cc:38: error: undefined reference to 'content::UtilityThread::UtilityThread()'
../../content/utility/utility_thread_impl.cc:44: error: undefined reference to 'content::UtilityThread::UtilityThread()'
../../content/utility/utility_thread_impl.cc:49: error: undefined reference to 'content::UtilityThread::~UtilityThread()'
clang: error: linker command failed with exit code 1 (use -v to see invocation)
ninja: build stopped: subcommand failed.
Original issue's description:
> Make ui gn check pass. Misc GN build improvements.
>
> Content/public/app was messed up and didn't link everything properly, so this separates it out into browser and child like content/app is.
>
> R=jamesr@chromium.org
>
> Committed: https://chromium.googlesource.com/chromium/src/+/b41a8d6e789ac5df9a6d314cd0ad59f584f53dea
TBR=jamesr@chromium.org,brettw@chromium.org
NOTREECHECKS=true
NOTRY=true
Review URL: https://codereview.chromium.org/546943003
Cr-Commit-Position: refs/heads/master@{#293595}
Diffstat (limited to 'ui/base')
| -rw-r--r-- | ui/base/BUILD.gn | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/ui/base/BUILD.gn b/ui/base/BUILD.gn index 0099427..94b1864 100644 --- a/ui/base/BUILD.gn +++ b/ui/base/BUILD.gn @@ -308,10 +308,6 @@ component("base") { ] } else { deps += [ "//ui/base/ime" ] - - # http://crbug.com/408648 Circular includes from the ime sub-target to this - # one. - allow_circular_includes_from = [ "//ui/base/ime" ] } if (toolkit_views) { |