| OLD | NEW |
| 1 # Copyright 2014 The Chromium Authors. All rights reserved. | 1 # Copyright 2014 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 'type': 'shared_library', | 5 'type': 'shared_library', |
| 6 'android_unmangled_name': 1, | 6 'android_unmangled_name': 1, |
| 7 'dependencies': [ | 7 'dependencies': [ |
| 8 'android_webview_common', | 8 'android_webview_common', |
| 9 ], | 9 ], |
| 10 'conditions': [ | 10 'conditions': [ |
| (...skipping 13 matching lines...) Expand all Loading... |
| 24 '../content/content.gyp:speech_recognition_error_java', | 24 '../content/content.gyp:speech_recognition_error_java', |
| 25 '../media/media.gyp:media_android_imageformat_list', | 25 '../media/media.gyp:media_android_imageformat_list', |
| 26 '../net/net.gyp:cert_verify_status_android_java', | 26 '../net/net.gyp:cert_verify_status_android_java', |
| 27 '../net/net.gyp:certificate_mime_types_java', | 27 '../net/net.gyp:certificate_mime_types_java', |
| 28 '../net/net.gyp:net_errors_java', | 28 '../net/net.gyp:net_errors_java', |
| 29 '../net/net.gyp:private_key_types_java', | 29 '../net/net.gyp:private_key_types_java', |
| 30 '../ui/android/ui_android.gyp:bitmap_format_java', | 30 '../ui/android/ui_android.gyp:bitmap_format_java', |
| 31 '../ui/android/ui_android.gyp:page_transition_types_java', | 31 '../ui/android/ui_android.gyp:page_transition_types_java', |
| 32 '../ui/android/ui_android.gyp:window_open_disposition_java', | 32 '../ui/android/ui_android.gyp:window_open_disposition_java', |
| 33 ], | 33 ], |
| 34 # Enable feedback-directed optimisation for the library when building in |
| 35 # android. |
| 36 'aosp_build_settings': { |
| 37 'LOCAL_FDO_SUPPORT': 'true', |
| 38 }, |
| 34 }], | 39 }], |
| 35 [ 'android_webview_build==1 and use_system_skia==0', { | 40 [ 'android_webview_build==1 and use_system_skia==0', { |
| 36 # When not using the system skia there are linker warnings about | 41 # When not using the system skia there are linker warnings about |
| 37 # overriden hidden symbols which there's no easy way to eliminate; | 42 # overriden hidden symbols which there's no easy way to eliminate; |
| 38 # disable them. http://crbug.com/157326 | 43 # disable them. http://crbug.com/157326 |
| 39 'ldflags': [ | 44 'ldflags': [ |
| 40 '-Wl,--no-fatal-warnings', | 45 '-Wl,--no-fatal-warnings', |
| 41 ], | 46 ], |
| 42 'ldflags!': [ | 47 'ldflags!': [ |
| 43 '-Wl,--fatal-warnings', | 48 '-Wl,--fatal-warnings', |
| 44 ], | 49 ], |
| 45 }], | 50 }], |
| 46 ['android_webview_build==1 and use_system_stlport==1 and use_system_icu==0',
{ | 51 ['android_webview_build==1 and use_system_stlport==1 and use_system_icu==0',
{ |
| 47 # ICU requires RTTI, which is not present in the system's stlport, so | 52 # ICU requires RTTI, which is not present in the system's stlport, so |
| 48 # we have to include gabi++. We can't include it in icu.gyp because | 53 # we have to include gabi++. We can't include it in icu.gyp because |
| 49 # link_settings cannot be used inside target_conditions. This will be | 54 # link_settings cannot be used inside target_conditions. This will be |
| 50 # removed once we stop using the system stlport. | 55 # removed once we stop using the system stlport. |
| 51 # http://crbug.com/409851 | 56 # http://crbug.com/409851 |
| 52 'libraries': [ | 57 'libraries': [ |
| 53 '-lgabi++', | 58 '-lgabi++', |
| 54 ], | 59 ], |
| 55 }], | 60 }], |
| 56 ], | 61 ], |
| 57 'sources': [ | 62 'sources': [ |
| 58 'lib/main/webview_entry_point.cc', | 63 'lib/main/webview_entry_point.cc', |
| 59 ], | 64 ], |
| 60 } | 65 } |
| 61 | 66 |
| OLD | NEW |