| 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 { | 5 { |
| 6 'conditions': [ | 6 'conditions': [ |
| 7 ['OS=="android"', { | 7 ['OS=="android"', { |
| 8 # TODO(mef): Consider moving all Cronet Android targets into separate | 8 # TODO(mef): Consider moving all Cronet Android targets into separate |
| 9 # file. Also figure out what needs to be done for gn script. | 9 # file. Also figure out what needs to be done for gn script. |
| 10 'targets': [ | 10 'targets': [ |
| (...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 82 '-fvisibility=hidden', | 82 '-fvisibility=hidden', |
| 83 '-fvisibility-inlines-hidden', | 83 '-fvisibility-inlines-hidden', |
| 84 '-Wno-sign-promo', | 84 '-Wno-sign-promo', |
| 85 '-Wno-missing-field-initializers', | 85 '-Wno-missing-field-initializers', |
| 86 ], | 86 ], |
| 87 'ldflags': [ | 87 'ldflags': [ |
| 88 '-llog', | 88 '-llog', |
| 89 '-landroid', | 89 '-landroid', |
| 90 '-Wl,--gc-sections', | 90 '-Wl,--gc-sections', |
| 91 '-Wl,--exclude-libs,ALL' | 91 '-Wl,--exclude-libs,ALL' |
| 92 ] | 92 ], |
| 93 'conditions': [ |
| 94 [ 'use_icu_alternatives_on_android == 1', { |
| 95 'dependencies!': [ |
| 96 '../base/base.gyp:base_i18n', |
| 97 '../third_party/icu/icu.gyp:icui18n', |
| 98 '../third_party/icu/icu.gyp:icuuc', |
| 99 ] |
| 100 }, |
| 101 ], |
| 102 ], |
| 93 }, | 103 }, |
| 94 { | 104 { |
| 95 'target_name': 'cronet', | 105 'target_name': 'cronet', |
| 96 'type': 'none', | 106 'type': 'none', |
| 97 'dependencies': [ | 107 'dependencies': [ |
| 98 '../base/base.gyp:base', | 108 '../base/base.gyp:base', |
| 99 'libcronet', | 109 'libcronet', |
| 100 'cronet_url_request_error_list', | 110 'cronet_url_request_error_list', |
| 101 'cronet_url_request_priority_list', | 111 'cronet_url_request_priority_list', |
| 102 ], | 112 ], |
| (...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 186 'java_in_dir': 'cronet/android/sample/javatests', | 196 'java_in_dir': 'cronet/android/sample/javatests', |
| 187 'resource_dir': 'cronet/android/sample/res', | 197 'resource_dir': 'cronet/android/sample/res', |
| 188 'is_test_apk': 1, | 198 'is_test_apk': 1, |
| 189 }, | 199 }, |
| 190 'includes': [ '../build/java_apk.gypi' ], | 200 'includes': [ '../build/java_apk.gypi' ], |
| 191 }, | 201 }, |
| 192 ], | 202 ], |
| 193 }], # OS=="android" | 203 }], # OS=="android" |
| 194 ], | 204 ], |
| 195 } | 205 } |
| OLD | NEW |