summaryrefslogtreecommitdiffstats
path: root/android_webview
diff options
context:
space:
mode:
authortorne@chromium.org <torne@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-05-17 13:46:10 +0000
committertorne@chromium.org <torne@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-05-17 13:46:10 +0000
commit5878b725ef0648d636b06241c20ebdc76dcf83e4 (patch)
tree2ba931064a5a05cd8eb4fffb876017d58d4706e9 /android_webview
parentdf8e98a7e51a68e662fe1086ea7ac4ed07534df6 (diff)
downloadchromium_src-5878b725ef0648d636b06241c20ebdc76dcf83e4.zip
chromium_src-5878b725ef0648d636b06241c20ebdc76dcf83e4.tar.gz
chromium_src-5878b725ef0648d636b06241c20ebdc76dcf83e4.tar.bz2
Android WebView: tidy up library dependencies.
The comment in android_webview.gyp about static library dependencies not being handled correctly is incorrect, and the workaround not necessary: the problem was just that I wasn't using link_settings correctly. Remove the workaround and instead add proper dependencies in the places that actually use cpufeatures and cutils (ashmem). This doesn't change the generated makefiles but makes more logical sense. BUG= R=digit@chromium.org Review URL: https://codereview.chromium.org/14753011 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@200806 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'android_webview')
-rw-r--r--android_webview/android_webview.gyp10
1 files changed, 0 insertions, 10 deletions
diff --git a/android_webview/android_webview.gyp b/android_webview/android_webview.gyp
index 46d7f78..8572ee8 100644
--- a/android_webview/android_webview.gyp
+++ b/android_webview/android_webview.gyp
@@ -23,16 +23,6 @@
'sources': [
'lib/main/webview_entry_point.cc',
],
- 'conditions': [
- ['android_webview_build == 1', {
- 'libraries': [
- # The "android" gyp backend doesn't quite handle static libraries'
- # dependencies correctly; force this to be linked as a workaround.
- 'cpufeatures.a',
- '-lcutils',
- ],
- }],
- ],
},
{
'target_name': 'android_webview_pak',