| OLD | NEW |
| 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2012 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 'linux_link_kerberos%': 0, | 9 'linux_link_kerberos%': 0, |
| 10 'conditions': [ | 10 'conditions': [ |
| (...skipping 1095 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1106 '$(SDKROOT)/System/Library/Frameworks/SystemConfiguration.framew
ork', | 1106 '$(SDKROOT)/System/Library/Frameworks/SystemConfiguration.framew
ork', |
| 1107 '$(SDKROOT)/usr/lib/libresolv.dylib', | 1107 '$(SDKROOT)/usr/lib/libresolv.dylib', |
| 1108 ], | 1108 ], |
| 1109 }, | 1109 }, |
| 1110 }, | 1110 }, |
| 1111 ], | 1111 ], |
| 1112 ['OS=="android" and _toolset=="target" and android_build_type == 0', { | 1112 ['OS=="android" and _toolset=="target" and android_build_type == 0', { |
| 1113 'dependencies': [ | 1113 'dependencies': [ |
| 1114 'net_java', | 1114 'net_java', |
| 1115 ], | 1115 ], |
| 1116 'export_dependent_settings': [ | |
| 1117 'net_java', | |
| 1118 ], | |
| 1119 }], | 1116 }], |
| 1120 [ 'OS == "android"', { | 1117 [ 'OS == "android"', { |
| 1121 'dependencies': [ | 1118 'dependencies': [ |
| 1122 '../third_party/openssl/openssl.gyp:openssl', | 1119 '../third_party/openssl/openssl.gyp:openssl', |
| 1123 'net_jni_headers', | 1120 'net_jni_headers', |
| 1124 ], | 1121 ], |
| 1125 'sources!': [ | 1122 'sources!': [ |
| 1126 'base/dnssec_chain_verifier.cc', | 1123 'base/dnssec_chain_verifier.cc', |
| 1127 'base/openssl_memory_private_key_store.cc', | 1124 'base/openssl_memory_private_key_store.cc', |
| 1128 ], | 1125 ], |
| (...skipping 1013 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2142 'target_name': 'net_java', | 2139 'target_name': 'net_java', |
| 2143 'type': 'none', | 2140 'type': 'none', |
| 2144 'variables': { | 2141 'variables': { |
| 2145 'package_name': 'net', | 2142 'package_name': 'net', |
| 2146 'java_in_dir': '../net/android/java', | 2143 'java_in_dir': '../net/android/java', |
| 2147 }, | 2144 }, |
| 2148 'dependencies': [ | 2145 'dependencies': [ |
| 2149 '../base/base.gyp:base', | 2146 '../base/base.gyp:base', |
| 2150 'net_errors_java', | 2147 'net_errors_java', |
| 2151 ], | 2148 ], |
| 2152 'export_dependent_settings': [ | |
| 2153 '../base/base.gyp:base', | |
| 2154 ], | |
| 2155 'includes': [ '../build/java.gypi' ], | 2149 'includes': [ '../build/java.gypi' ], |
| 2156 }, | 2150 }, |
| 2157 { | 2151 { |
| 2158 'target_name': 'net_javatests', | 2152 'target_name': 'net_javatests', |
| 2159 'type': 'none', | 2153 'type': 'none', |
| 2160 'variables': { | 2154 'variables': { |
| 2161 'package_name': 'net_javatests', | 2155 'package_name': 'net_javatests', |
| 2162 'java_in_dir': '../net/android/javatests', | 2156 'java_in_dir': '../net/android/javatests', |
| 2163 }, | 2157 }, |
| 2164 'dependencies': [ | 2158 'dependencies': [ |
| 2165 '../base/base.gyp:base', | 2159 '../base/base.gyp:base', |
| 2166 '../base/base.gyp:base_java_test_support', | 2160 '../base/base.gyp:base_java_test_support', |
| 2167 'net_java', | 2161 'net_java', |
| 2168 ], | 2162 ], |
| 2169 'export_dependent_settings': [ | |
| 2170 '../base/base.gyp:base', | |
| 2171 '../base/base.gyp:base_java_test_support', | |
| 2172 'net_java', | |
| 2173 ], | |
| 2174 'includes': [ '../build/java.gypi' ], | 2163 'includes': [ '../build/java.gypi' ], |
| 2175 }, | 2164 }, |
| 2176 { | 2165 { |
| 2177 # This should be extracted to a gypi file and parameterized if | 2166 # This should be extracted to a gypi file and parameterized if |
| 2178 # we have more use cases of using the preprocessor to build java files
. | 2167 # we have more use cases of using the preprocessor to build java files
. |
| 2179 'target_name': 'net_errors_java', | 2168 'target_name': 'net_errors_java', |
| 2180 'type': 'none', | 2169 'type': 'none', |
| 2181 'direct_dependent_settings': { | 2170 'direct_dependent_settings': { |
| 2182 'variables': { | 2171 'variables': { |
| 2183 'generated_src_dirs': ['<(SHARED_INTERMEDIATE_DIR)/net/template/']
, | 2172 'generated_src_dirs': ['<(SHARED_INTERMEDIATE_DIR)/net/template/']
, |
| (...skipping 101 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2285 '--result', '<@(_outputs)', | 2274 '--result', '<@(_outputs)', |
| 2286 '--isolate', 'net_unittests.isolate', | 2275 '--isolate', 'net_unittests.isolate', |
| 2287 ], | 2276 ], |
| 2288 }, | 2277 }, |
| 2289 ], | 2278 ], |
| 2290 }, | 2279 }, |
| 2291 ], | 2280 ], |
| 2292 }], | 2281 }], |
| 2293 ], | 2282 ], |
| 2294 } | 2283 } |
| OLD | NEW |