diff options
| author | tony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-20 18:10:07 +0000 |
|---|---|---|
| committer | tony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-20 18:10:07 +0000 |
| commit | d275b1951ee05c7325901a433fa7a58f04797221 (patch) | |
| tree | be8c5cca3d8dcac13baa93b22b049b80c5a5e63c /app | |
| parent | 9db6433c6502bbb0acc812c70e00af9823284968 (diff) | |
| download | chromium_src-d275b1951ee05c7325901a433fa7a58f04797221.zip chromium_src-d275b1951ee05c7325901a433fa7a58f04797221.tar.gz chromium_src-d275b1951ee05c7325901a433fa7a58f04797221.tar.bz2 | |
Remove files that are compiled in both ui_base and app_base.
This causes problems when linking because there are duplicate symbols
when the same file is compiled into two libs. Previously we were letting
the linker collapse these, but that's slow and will start throwing errors
once gyp is rolled.
Review URL: http://codereview.chromium.org/7040022
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@86110 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'app')
| -rw-r--r-- | app/app.gyp | 8 | ||||
| -rw-r--r-- | app/app_base.gypi | 26 |
2 files changed, 2 insertions, 32 deletions
diff --git a/app/app.gyp b/app/app.gyp index e639728..57388d8 100644 --- a/app/app.gyp +++ b/app/app.gyp @@ -1,4 +1,4 @@ -# Copyright (c) 2010 The Chromium Authors. All rights reserved. +# Copyright (c) 2011 The Chromium Authors. All rights reserved. # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. @@ -26,14 +26,10 @@ '../third_party/icu/icu.gyp:icuuc', '../third_party/libpng/libpng.gyp:libpng', '../third_party/zlib/zlib.gyp:zlib', + '../ui/ui.gyp:ui_base', '<(libjpeg_gyp_path):libjpeg', ], 'sources': [ - '../ui/base/animation/animation_container_unittest.cc', - '../ui/base/animation/animation_unittest.cc', - '../ui/base/animation/multi_animation_unittest.cc', - '../ui/base/animation/slide_animation_unittest.cc', - '../ui/base/clipboard/clipboard_unittest.cc', '../ui/base/dragdrop/os_exchange_data_win_unittest.cc', '../ui/base/l10n/l10n_util_mac_unittest.mm', '../ui/base/l10n/l10n_util_unittest.cc', diff --git a/app/app_base.gypi b/app/app_base.gypi index c1c2669..2cf12fe1 100644 --- a/app/app_base.gypi +++ b/app/app_base.gypi @@ -82,32 +82,6 @@ }, 'sources': [ # Files that are not required for Win64 Native Client loader - '../ui/base/animation/animation.cc', - '../ui/base/animation/animation.h', - '../ui/base/animation/animation_container.cc', - '../ui/base/animation/animation_container.h', - '../ui/base/animation/animation_container_element.h', - '../ui/base/animation/animation_container_observer.h', - '../ui/base/animation/animation_delegate.h', - '../ui/base/animation/linear_animation.cc', - '../ui/base/animation/linear_animation.h', - '../ui/base/animation/multi_animation.cc', - '../ui/base/animation/multi_animation.h', - '../ui/base/animation/slide_animation.cc', - '../ui/base/animation/slide_animation.h', - '../ui/base/animation/throb_animation.cc', - '../ui/base/animation/throb_animation.h', - '../ui/base/animation/tween.cc', - '../ui/base/animation/tween.h', - '../ui/base/clipboard/clipboard.cc', - '../ui/base/clipboard/clipboard.h', - '../ui/base/clipboard/clipboard_linux.cc', - '../ui/base/clipboard/clipboard_mac.mm', - '../ui/base/clipboard/clipboard_util_win.cc', - '../ui/base/clipboard/clipboard_util_win.h', - '../ui/base/clipboard/clipboard_win.cc', - '../ui/base/clipboard/scoped_clipboard_writer.cc', - '../ui/base/clipboard/scoped_clipboard_writer.h', '../ui/base/dragdrop/drag_drop_types_gtk.cc', '../ui/base/dragdrop/drag_drop_types_win.cc', '../ui/base/dragdrop/drag_drop_types.h', |