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

Side by Side Diff: net/net.gyp

Issue 10963041: Revert "Revert 158067 - Remove native side of content_view_client" (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Add additional_input_paths as a variable and input to java.gypi Created 8 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 | Annotate | Revision Log
« no previous file with comments | « net/android/java/net_errors_java.template ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 2188 matching lines...) Expand 10 before | Expand all | Expand 10 after
2199 'includes': [ '../build/java.gypi' ], 2199 'includes': [ '../build/java.gypi' ],
2200 }, 2200 },
2201 { 2201 {
2202 # This should be extracted to a gypi file and parameterized if 2202 # This should be extracted to a gypi file and parameterized if
2203 # we have more use cases of using the preprocessor to build java files . 2203 # we have more use cases of using the preprocessor to build java files .
2204 'target_name': 'net_errors_java', 2204 'target_name': 'net_errors_java',
2205 'type': 'none', 2205 'type': 'none',
2206 'direct_dependent_settings': { 2206 'direct_dependent_settings': {
2207 'variables': { 2207 'variables': {
2208 'additional_src_dirs': ['<(SHARED_INTERMEDIATE_DIR)/net/template/' ], 2208 'additional_src_dirs': ['<(SHARED_INTERMEDIATE_DIR)/net/template/' ],
2209 'additional_input_paths': ['<(SHARED_INTERMEDIATE_DIR)/net/templat e/NetError.java'],
2209 }, 2210 },
2210 }, 2211 },
2211 'actions': [ 2212 'actions': [
2212 { 2213 {
2213 'action_name': 'generate_net_errors_java', 2214 'action_name': 'generate_net_errors_java',
2214 'inputs': [ 2215 'inputs': [
2215 'android/java/net_errors_java.template', 2216 'android/java/net_errors_java.template',
2216 ], 2217 ],
2217 'outputs': [ 2218 'outputs': [
2218 '<(SHARED_INTERMEDIATE_DIR)/net/template/NetError.java', 2219 '<(SHARED_INTERMEDIATE_DIR)/net/template/NetError.java',
(...skipping 90 matching lines...) Expand 10 before | Expand all | Expand 10 after
2309 '--result', '<@(_outputs)', 2310 '--result', '<@(_outputs)',
2310 '--isolate', 'net_unittests.isolate', 2311 '--isolate', 'net_unittests.isolate',
2311 ], 2312 ],
2312 }, 2313 },
2313 ], 2314 ],
2314 }, 2315 },
2315 ], 2316 ],
2316 }], 2317 }],
2317 ], 2318 ],
2318 } 2319 }
OLDNEW
« no previous file with comments | « net/android/java/net_errors_java.template ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698