diff options
| author | mkosiba@chromium.org <mkosiba@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-16 19:47:46 +0000 |
|---|---|---|
| committer | mkosiba@chromium.org <mkosiba@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-16 19:47:46 +0000 |
| commit | b678b85a3716bb705224009a386ae7df778b1d4e (patch) | |
| tree | 2f6efcbdafbc9ffa8bd2caae720c1be8342adc91 /android_webview/lib | |
| parent | 6e7b43a424bf0f7732547c61184f035c90c8001f (diff) | |
| download | chromium_src-b678b85a3716bb705224009a386ae7df778b1d4e.zip chromium_src-b678b85a3716bb705224009a386ae7df778b1d4e.tar.gz chromium_src-b678b85a3716bb705224009a386ae7df778b1d4e.tar.bz2 | |
[Android] Remove the webview_core static library.
This removes webview_core and moves the deps directly into
the libwebview target.
The reason for this change is that make doesn't work correctly
with a shared_library that doesn't contain any source files.
BUG=
Review URL: https://chromiumcodereview.appspot.com/10827382
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@151949 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'android_webview/lib')
| -rw-r--r-- | android_webview/lib/android_webview.gyp | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/android_webview/lib/android_webview.gyp b/android_webview/lib/android_webview.gyp index ceeedce..353e6bf 100644 --- a/android_webview/lib/android_webview.gyp +++ b/android_webview/lib/android_webview.gyp @@ -7,11 +7,8 @@ }, 'targets': [ { - # TODO(torne): This is vaguely based on the downstream android target - # "chromeview_core" and once that target has been upstreamed we should - # just depend on it instead. - 'target_name': 'webview_core', - 'type': 'static_library', + 'target_name': 'libwebview', + 'type': 'shared_library', 'dependencies': [ '../../chrome/chrome.gyp:browser', '../../chrome/chrome.gyp:renderer', @@ -20,16 +17,6 @@ 'include_dirs': [ '../..', ], - }, - { - 'target_name': 'libwebview', - 'type': 'shared_library', - 'dependencies': [ - 'webview_core', - ], - 'include_dirs': [ - '../..', - ], 'sources': [ 'main/webview_entry_point.cc', 'main/webview_main_delegate.cc', |