Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(273)

Side by Side Diff: android_webview/android_webview.gyp

Issue 541753002: android_webview: stop using system ICU. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | build/common.gypi » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright 2009 The Chromium Authors. All rights reserved. 1 # Copyright 2009 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 { 4 {
5 'variables': { 5 'variables': {
6 'chromium_code': 1, 6 'chromium_code': 1,
7 }, 7 },
8 'targets': [ 8 'targets': [
9 { 9 {
10 'target_name': 'libwebviewchromium', 10 'target_name': 'libwebviewchromium',
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
47 # When not using the system skia there are linker warnings about 47 # When not using the system skia there are linker warnings about
48 # overriden hidden symbols which there's no easy way to eliminate; 48 # overriden hidden symbols which there's no easy way to eliminate;
49 # disable them. http://crbug.com/157326 49 # disable them. http://crbug.com/157326
50 'ldflags': [ 50 'ldflags': [
51 '-Wl,--no-fatal-warnings', 51 '-Wl,--no-fatal-warnings',
52 ], 52 ],
53 'ldflags!': [ 53 'ldflags!': [
54 '-Wl,--fatal-warnings', 54 '-Wl,--fatal-warnings',
55 ], 55 ],
56 }], 56 }],
57 ['android_webview_build==1 and use_system_stlport==1', {
58 # ICU requires RTTI, which is not present in the system's stlport, so
59 # we have to include gabi++. We can't include it in icu.gyp because
60 # link_settings cannot be used inside target_conditions. This will be
61 # removed once we stop using the system stlport.
62 # http://crbug.com/409851
63 'libraries': [
64 '-lgabi++',
65 ],
66 }],
57 ], 67 ],
58 'sources': [ 68 'sources': [
59 'lib/main/webview_entry_point.cc', 69 'lib/main/webview_entry_point.cc',
60 ], 70 ],
61 }, 71 },
62 { 72 {
63 'target_name': 'android_webview_pak', 73 'target_name': 'android_webview_pak',
64 'type': 'none', 74 'type': 'none',
65 'dependencies': [ 75 'dependencies': [
66 '<(DEPTH)/content/app/resources/content_resources.gyp:content_resources' , 76 '<(DEPTH)/content/app/resources/content_resources.gyp:content_resources' ,
(...skipping 254 matching lines...) Expand 10 before | Expand all | Expand 10 after
321 '../ui/android/ui_android.gyp:ui_strings_grd', 331 '../ui/android/ui_android.gyp:ui_strings_grd',
322 'android_webview_jarjar_content_resources', 332 'android_webview_jarjar_content_resources',
323 'android_webview_jarjar_ui_resources', 333 'android_webview_jarjar_ui_resources',
324 'android_webview_strings_grd', 334 'android_webview_strings_grd',
325 ], 335 ],
326 }, 336 },
327 ], 337 ],
328 }], 338 }],
329 ], 339 ],
330 } 340 }
OLDNEW
« no previous file with comments | « no previous file | build/common.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698