Skip to content

Commit

Permalink
android_webview: stop using system ICU.
Browse files Browse the repository at this point in the history
To support unbundled updates we need to stop depending on system
libraries. Disable using the system version of ICU and instead link
Chromium's copy.

This increases binary size by ~7MB.

BUG=409851

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

Cr-Commit-Position: refs/heads/master@{#293510}
  • Loading branch information
tornewuff authored and Commit bot committed Sep 5, 2014
1 parent eedd8b8 commit 48e4357
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 1 deletion.
10 changes: 10 additions & 0 deletions android_webview/android_webview.gyp
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,16 @@
'-Wl,--fatal-warnings',
],
}],
['android_webview_build==1 and use_system_stlport==1', {
# ICU requires RTTI, which is not present in the system's stlport, so
# we have to include gabi++. We can't include it in icu.gyp because
# link_settings cannot be used inside target_conditions. This will be
# removed once we stop using the system stlport.
# http://crbug.com/409851
'libraries': [
'-lgabi++',
],
}],
],
'sources': [
'lib/main/webview_entry_point.cc',
Expand Down
1 change: 0 additions & 1 deletion build/common.gypi
Original file line number Diff line number Diff line change
Expand Up @@ -1797,7 +1797,6 @@

# When building as part of the Android system, use system libraries
# where possible to reduce ROM size.
'use_system_icu%': '<(android_webview_build)',
'use_system_stlport%': '<(android_webview_build)',

# Copy it out one scope.
Expand Down

0 comments on commit 48e4357

Please sign in to comment.