Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 # Copyright 2013 The Chromium Authors. All rights reserved. | 1 # Copyright 2013 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 'variables': { | 6 'variables': { |
| 7 'chromium_code': 1, | 7 'chromium_code': 1, |
| 8 }, | 8 }, |
| 9 'includes': [ | 9 'includes': [ |
| 10 'url_srcs.gypi', | 10 'url_srcs.gypi', |
| 11 ], | 11 ], |
| 12 'targets': [ | 12 'targets': [ |
| 13 { | 13 { |
| 14 # Note, this target_name cannot be 'url', because that will generate | 14 # Note, this target_name cannot be 'url', because that will generate |
| 15 # 'url.dll' for a Windows component build, and that will confuse Windows, | 15 # 'url.dll' for a Windows component build, and that will confuse Windows, |
| 16 # which has a system DLL with the same name. | 16 # which has a system DLL with the same name. |
| 17 'target_name': 'url_lib', | 17 'target_name': 'url_lib', |
| 18 'type': '<(component)', | 18 'type': '<(component)', |
| 19 'dependencies': [ | 19 'dependencies': [ |
| 20 '../base/base.gyp:base', | 20 '../base/base.gyp:base', |
| 21 '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic _annotations', | 21 '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic _annotations', |
| 22 '../third_party/icu/icu.gyp:icui18n', | 22 '../third_party/icu/icu.gyp:icui18n', |
| 23 '../third_party/icu/icu.gyp:icuuc', | 23 '../third_party/icu/icu.gyp:icuuc', |
| 24 ], | 24 ], |
| 25 'sources': [ | 25 'sources': [ |
| 26 '<@(gurl_sources)', | 26 '<@(gurl_sources)', |
| 27 'ipc/url_param_traits.cc', | |
|
brettw
2016/02/22 22:07:15
This should be in a separate target like GN. That
| |
| 28 'ipc/url_param_traits.h', | |
| 27 ], | 29 ], |
| 28 'direct_dependent_settings': { | 30 'direct_dependent_settings': { |
| 29 'include_dirs': [ | 31 'include_dirs': [ |
| 30 '..', | 32 '..', |
| 31 ], | 33 ], |
| 32 }, | 34 }, |
| 33 'defines': [ | 35 'defines': [ |
| 34 'URL_IMPLEMENTATION', | 36 'URL_IMPLEMENTATION', |
| 35 ], | 37 ], |
| 36 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. | 38 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. |
| (...skipping 14 matching lines...) Expand all Loading... | |
| 51 'scheme_host_port_unittest.cc', | 53 'scheme_host_port_unittest.cc', |
| 52 'url_canon_icu_unittest.cc', | 54 'url_canon_icu_unittest.cc', |
| 53 'url_canon_unittest.cc', | 55 'url_canon_unittest.cc', |
| 54 'url_parse_unittest.cc', | 56 'url_parse_unittest.cc', |
| 55 'url_test_utils.h', | 57 'url_test_utils.h', |
| 56 'url_util_unittest.cc', | 58 'url_util_unittest.cc', |
| 57 ], | 59 ], |
| 58 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. | 60 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. |
| 59 'msvs_disabled_warnings': [4267, ], | 61 'msvs_disabled_warnings': [4267, ], |
| 60 }, | 62 }, |
| 63 { | |
| 64 'target_name': 'url_ipc_unittests', | |
| 65 'type': 'executable', | |
| 66 'dependencies': [ | |
| 67 '../base/base.gyp:run_all_unittests', | |
| 68 '../testing/gtest.gyp:gtest', | |
| 69 'url_lib', | |
| 70 ], | |
| 71 'sources': [ 'url_param_traits_unittest.cc' ], | |
| 72 }, | |
| 61 ], | 73 ], |
| 62 'conditions': [ | 74 'conditions': [ |
| 63 ['OS=="android"', { | 75 ['OS=="android"', { |
| 64 'targets': [ | 76 'targets': [ |
| 65 { | 77 { |
| 66 'target_name': 'url_jni_headers', | 78 'target_name': 'url_jni_headers', |
| 67 'type': 'none', | 79 'type': 'none', |
| 68 'sources': [ | 80 'sources': [ |
| 69 'android/java/src/org/chromium/url/IDNStringUtil.java' | 81 'android/java/src/org/chromium/url/IDNStringUtil.java' |
| 70 ], | 82 ], |
| (...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 127 '../build/isolate.gypi', | 139 '../build/isolate.gypi', |
| 128 ], | 140 ], |
| 129 'sources': [ | 141 'sources': [ |
| 130 'url_unittests.isolate', | 142 'url_unittests.isolate', |
| 131 ], | 143 ], |
| 132 }, | 144 }, |
| 133 ], | 145 ], |
| 134 }], | 146 }], |
| 135 ], | 147 ], |
| 136 } | 148 } |
| OLD | NEW |