diff options
| author | mek@chromium.org <mek@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-04 23:43:04 +0000 |
|---|---|---|
| committer | mek@chromium.org <mek@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-04 23:43:04 +0000 |
| commit | ef198a101f10c40b44c0397bd4f8a37c6ec51344 (patch) | |
| tree | f33be070280443bf89914cff9528cfa160cf67af /athena/athena.gyp | |
| parent | 846c0c15544ae379c552d56542bb560fb7cd23db (diff) | |
| download | chromium_src-ef198a101f10c40b44c0397bd4f8a37c6ec51344.zip chromium_src-ef198a101f10c40b44c0397bd4f8a37c6ec51344.tar.gz chromium_src-ef198a101f10c40b44c0397bd4f8a37c6ec51344.tar.bz2 | |
Revert of Replace the HomeCard by the AppList in Athena. (https://codereview.chromium.org/306083005/)
Reason for revert:
Seems to break compilation on Linux Chromium OS ASan LSan Builder:
FAILED: /mnt/data/b/build/goma/gomacc ../../third_party/llvm-build/Release+Asserts/bin/clang++ -Wl,-z,now -Wl,-z,relro -Wl,--fatal-warnings -pthread -Wl,-z,noexecstack -fPIC -B/mnt/data/b/build/slave/Linux_Chromium_OS_ASan_LSan_Builder/build/src/third_party/binutils/Linux_x64/Release/bin -Wl,--disable-new-dtags -L. -Wl,-u_sanitizer_options_link_helper -m64 -fsanitize=address -fsanitize=leak -Wl,--icf=none -Wl,-O1 -Wl,--gc-sections -o athena_shell -Wl,--start-group [..]
../../content/browser/renderer_host/pepper/browser_ppapi_host_impl.cc:61:error: undefined reference to 'ppapi::host::PpapiHost::PpapiHost(IPC::Sender*, ppapi::PpapiPermissions const&)'
../../content/browser/renderer_host/pepper/browser_ppapi_host_impl.cc:63:error: undefined reference to 'ppapi::host::PpapiHost::AddHostFactoryFilter(scoped_ptr<ppapi::host::HostFactory, base::DefaultDeleter<ppapi::host::HostFactory> >)'
../../content/browser/renderer_host/pepper/content_browser_pepper_host_factory.cc:123:error: undefined reference to 'ppapi::host::MessageFilterHost::MessageFilterHost(ppapi::host::PpapiHost*, int, int, scoped_refptr<ppapi::host::ResourceMessageFilter> const&)'
../../content/browser/renderer_host/pepper/content_browser_pepper_host_factory.cc:93:error: undefined reference to 'ppapi::host::MessageFilterHost::MessageFilterHost(ppapi::host::PpapiHost*, int, int, scoped_refptr<ppapi::host::ResourceMessageFilter> const&)'
[etc...]
Original issue's description:
> Replace the HomeCard by the AppList in Athena.
>
> BUG=370204
> R=oshima@chromium.org, benwells@chromium.org
> TBR=reed@google.com
> TEST=manually
>
> Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=274942
TBR=oshima@chromium.org,benwells@chromium.org,xiyuan@chromium.org,reed@google.com,mukai@chromium.org
NOTREECHECKS=true
NOTRY=true
BUG=370204
Review URL: https://codereview.chromium.org/319603004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@274953 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'athena/athena.gyp')
| -rw-r--r-- | athena/athena.gyp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/athena/athena.gyp b/athena/athena.gyp index 25423f8..f418dcc 100644 --- a/athena/athena.gyp +++ b/athena/athena.gyp @@ -12,7 +12,6 @@ 'type': '<(component)', 'dependencies': [ '../ui/aura/aura.gyp:aura', - '../ui/app_list/app_list.gyp:app_list', '../ui/views/views.gyp:views', '../ui/accessibility/accessibility.gyp:ax_gen', '../skia/skia.gyp:skia', @@ -23,8 +22,8 @@ 'sources': [ # All .cc, .h under athena, except unittests 'athena_export.h', - 'home/app_list_view_delegate.cc', - 'home/app_list_view_delegate.h', + 'home/home_card_delegate_view.cc', + 'home/home_card_delegate_view.h', 'home/home_card_impl.cc', 'home/public/home_card.h', 'screen/background_controller.cc', |