Skip to content

Commit

Permalink
WebView: avoid library name clash when building standalone.
Browse files Browse the repository at this point in the history
The standalone libwebviewchromium.so "clashes" with the one built using
android_webview_build==1; rename it in the standalone case so that if
you end up with both available, the correct one is used.

product_prefix is used because this ensures that the existing logic to
use product_extension to make component builds work is not disrupted.
Tested change with component and non-component builds.

BUG=

Review URL: https://codereview.chromium.org/37373002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@230485 0039d316-1c4b-4281-b951-d872f2087c98
  • Loading branch information
torne@chromium.org committed Oct 23, 2013
1 parent a44a5a0 commit 7c5e1dd
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 1 deletion.
5 changes: 5 additions & 0 deletions android_webview/android_webview.gyp
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,11 @@
'android_webview_common',
],
'conditions': [
# Avoid clashes between the versions of this library built with
# android_webview_build==1 by using a different name prefix.
[ 'android_webview_build==0', {
'product_prefix': 'libstandalone',
}],
# The general approach is to allow the executable target to choose
# the allocator, but as in the WebView case we are building a library
# only, put the dependency on the allocator here
Expand Down
2 changes: 1 addition & 1 deletion android_webview/android_webview_tests.gypi
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
'variables': {
'apk_name': 'AndroidWebView',
'java_in_dir': 'test/shell',
'native_lib_target': 'libwebviewchromium',
'native_lib_target': 'libstandalonelibwebviewchromium',
'resource_dir': 'test/shell/res',
'additional_input_paths': [
'<(PRODUCT_DIR)/android_webview_apk/assets/webviewchromium.pak',
Expand Down

0 comments on commit 7c5e1dd

Please sign in to comment.