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

Side by Side Diff: net/net.gyp

Issue 10912136: Build NetError.java to use in java side tests by preprocessing net_errors.cc (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fixed to net.gyp and fixed comments 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
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 2058 matching lines...) Expand 10 before | Expand all | Expand 10 after
2069 'type': 'none', 2069 'type': 'none',
2070 'variables': { 2070 'variables': {
2071 'package_name': 'net', 2071 'package_name': 'net',
2072 'java_in_dir': '../net/android/java', 2072 'java_in_dir': '../net/android/java',
2073 }, 2073 },
2074 'dependencies': [ 2074 'dependencies': [
2075 '../base/base.gyp:base_java', 2075 '../base/base.gyp:base_java',
2076 ], 2076 ],
2077 'export_dependent_settings': [ 2077 'export_dependent_settings': [
2078 '../base/base.gyp:base_java', 2078 '../base/base.gyp:base_java',
2079 'net_errors_java',
Yaron 2012/09/07 22:49:06 Sorry if I was unclear. This needs to be in both "
cjhopman 2012/09/07 23:03:23 I believe that this should only be in dependencies
2079 ], 2080 ],
2080 'includes': [ '../build/java.gypi' ], 2081 'includes': [ '../build/java.gypi' ],
2081 }, 2082 },
2082 { 2083 {
2083 'target_name': 'net_javatests', 2084 'target_name': 'net_javatests',
2084 'type': 'none', 2085 'type': 'none',
2085 'variables': { 2086 'variables': {
2086 'package_name': 'net_javatests', 2087 'package_name': 'net_javatests',
2087 'java_in_dir': '../net/android/javatests', 2088 'java_in_dir': '../net/android/javatests',
2088 }, 2089 },
2089 'dependencies': [ 2090 'dependencies': [
2090 '../base/base.gyp:base_java', 2091 '../base/base.gyp:base_java',
2091 '../base/base.gyp:base_java_test_support', 2092 '../base/base.gyp:base_java_test_support',
2093 'net_java',
2092 ], 2094 ],
2093 'export_dependent_settings': [ 2095 'export_dependent_settings': [
2094 '../base/base.gyp:base_java', 2096 '../base/base.gyp:base_java',
2095 '../base/base.gyp:base_java_test_support', 2097 '../base/base.gyp:base_java_test_support',
2096 ], 2098 ],
2097 'includes': [ '../build/java.gypi' ], 2099 'includes': [ '../build/java.gypi' ],
2098 }, 2100 },
2101 {
2102 # This should be extracted to a gypi file and parametrized if we have more use cases of
willchan no longer on Chromium 2012/09/07 22:50:13 80 cols s/parametrized/parameterized/
2103 # using the preprocessor to build java files.
2104 'target_name': 'net_errors_java',
2105 'type': 'none',
2106 'direct_dependent_settings': {
2107 'variables': {
2108 'additional_src_dirs': ['<(SHARED_INTERMEDIATE_DIR)/net/template/' ],
2109 },
2110 },
2111 'actions': [
2112 {
2113 'action_name': 'generate_net_errors_java',
2114 'inputs': [
2115 'android/java/net_errors_java.template',
2116 ],
2117 'outputs': [
2118 '<(SHARED_INTERMEDIATE_DIR)/net/template/NetError.java',
2119 ],
2120 'action': [
2121 'gcc',
2122 '-x', 'c-header',
2123 '-E', '-P',
2124 '-I', '..',
2125 '-o',
2126 '<@(_outputs)',
2127 '<@(_inputs)',
2128 ],
2129 'message': 'Preprocessing <(_inputs)',
2130 'process_outputs_as_sources': 1,
2131 },
2132 ],
2133 },
2099 ], 2134 ],
2100 }], 2135 }],
2101 # Special target to wrap a gtest_target_type==shared_library 2136 # Special target to wrap a gtest_target_type==shared_library
2102 # net_unittests into an android apk for execution. 2137 # net_unittests into an android apk for execution.
2103 # See base.gyp for TODO(jrg)s about this strategy. 2138 # See base.gyp for TODO(jrg)s about this strategy.
2104 ['OS == "android" and gtest_target_type == "shared_library"', { 2139 ['OS == "android" and gtest_target_type == "shared_library"', {
2105 'targets': [ 2140 'targets': [
2106 { 2141 {
2107 'target_name': 'net_unittests_apk', 2142 'target_name': 'net_unittests_apk',
2108 'type': 'none', 2143 'type': 'none',
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after
2174 '--result', '<@(_outputs)', 2209 '--result', '<@(_outputs)',
2175 '--isolate', 'net_unittests.isolate', 2210 '--isolate', 'net_unittests.isolate',
2176 ], 2211 ],
2177 }, 2212 },
2178 ], 2213 ],
2179 }, 2214 },
2180 ], 2215 ],
2181 }], 2216 }],
2182 ], 2217 ],
2183 } 2218 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698