diff options
| author | viettrungluu@chromium.org <viettrungluu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-10 04:22:11 +0000 |
|---|---|---|
| committer | viettrungluu@chromium.org <viettrungluu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-10 04:22:11 +0000 |
| commit | d0633f4852b69c421b9e26d7db1348326a59924f (patch) | |
| tree | f0412a89e264027cd5f34a33ee6af5df290a2aff /mojo/mojo_services.gypi | |
| parent | 1c8bcb12f7f63a59bf9c9ed1e33494aada5ceb74 (diff) | |
| download | chromium_src-d0633f4852b69c421b9e26d7db1348326a59924f.zip chromium_src-d0633f4852b69c421b9e26d7db1348326a59924f.tar.gz chromium_src-d0633f4852b69c421b9e26d7db1348326a59924f.tar.bz2 | |
Revert 275934 "Mojo: Fix mojo_test_service."
FAILED: if [ ! -e lib/libmojo_test_service.so -o ! -e lib/libmojo_test_service.so.TOC ]; then /b/build/goma/gomacc ../../third_party/llvm-build/Release+Asserts/bin/clang++ -shared -Wl,-z,now -Wl,-z,relro -Wl,--fatal-warnings -pthread -Wl,-z,noexecstack -fPIC -B/b/build/slave/Linux_Clang__dbg_/build/src/third_party/binutils/Linux_x64/Release/bin -Wl,--disable-new-dtags -m64 -Wl,--icf=none -Wl,--gdb-index -o lib/libmojo_test_service.so -Wl,-soname=libmojo_test_service.so @lib/libmojo_test_service.so.rsp && { readelf -d lib/libmojo_test_service.so | grep SONAME ; nm -gD -f p lib/libmojo_test_service.so | cut -f1-2 -d' '; } > lib/libmojo_test_service.so.TOC; else /b/build/goma/gomacc ../../third_party/llvm-build/Release+Asserts/bin/clang++ -shared -Wl,-z,now -Wl,-z,relro -Wl,--fatal-warnings -pthread -Wl,-z,noexecstack -fPIC -B/b/build/slave/Linux_Clang__dbg_/build/src/third_party/binutils/Linux_x64/Release/bin -Wl,--disable-new-dtags -m64 -Wl,--icf=none -Wl,--gdb-index -o lib/libmojo_test_service.so -Wl,-soname=libmojo_test_service.so @lib/libmojo_test_service.so.rsp && { readelf -d lib/libmojo_test_service.so | grep SONAME ; nm -gD -f p lib/libmojo_test_service.so | cut -f1-2 -d' '; } > lib/libmojo_test_service.so.tmp && if ! cmp -s lib/libmojo_test_service.so.tmp lib/libmojo_test_service.so.TOC; then mv lib/libmojo_test_service.so.tmp lib/libmojo_test_service.so.TOC ; fi; fi
/b/build/slave/Linux_Clang__dbg_/build/src/third_party/binutils/Linux_x64/Release/bin/ld: warning: hidden symbol 'MojoClose' in obj/mojo/libmojo_system.a(obj/mojo/public/platform/native/mojo_system.system_thunks.o) is referenced by DSO lib/libmojo_common_lib.so
(etc.)
> Mojo: Fix mojo_test_service.
>
> It should depend on mojo_system, not mojo_system_impl, since it's a
> proper external app. (For some reason, this didn't cause failures for me
> on Linux or Windows ... probably because they were
> component=shared_library builds. I think I'm still using a static
> library build on Mac....)
>
> R=sky@chromium.org
>
> Review URL: https://codereview.chromium.org/321503004
TBR=viettrungluu@chromium.org
Review URL: https://codereview.chromium.org/328623002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@275941 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'mojo/mojo_services.gypi')
| -rw-r--r-- | mojo/mojo_services.gypi | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mojo/mojo_services.gypi b/mojo/mojo_services.gypi index e948f54..2174bd0 100644 --- a/mojo/mojo_services.gypi +++ b/mojo/mojo_services.gypi @@ -338,7 +338,7 @@ 'mojo_common_lib', 'mojo_environment_standalone', 'mojo_test_service_bindings', - 'mojo_system', + 'mojo_system_impl', 'mojo_utility', ], 'sources': [ |