Chromium Code Reviews| 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 2055 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 2066 }, | 2066 }, |
| 2067 { | 2067 { |
| 2068 'target_name': 'net_java', | 2068 'target_name': 'net_java', |
| 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 'net_errors_java', | |
|
Yaron
2012/09/07 01:05:44
This should be added to export_dependent_settings
| |
| 2076 ], | 2077 ], |
| 2077 'export_dependent_settings': [ | 2078 'export_dependent_settings': [ |
| 2078 '../base/base.gyp:base_java', | 2079 '../base/base.gyp:base_java', |
| 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_errors_java', | |
|
Yaron
2012/09/07 01:05:44
This should be pulled transitively through net_jav
| |
| 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 'target_name': 'net_errors_java', | |
|
Yaron
2012/09/07 01:05:44
This should use a new gyp template (like build/jav
joth
2012/09/07 21:45:46
right now net_error_list.h is the only known examp
| |
| 2103 'type': 'none', | |
| 2104 'direct_dependent_settings': { | |
| 2105 'variables': { | |
| 2106 'additional_src_dirs': ['<(SHARED_INTERMEDIATE_DIR)/net/template/' ], | |
| 2107 }, | |
| 2108 }, | |
| 2109 'actions': [ | |
| 2110 { | |
| 2111 'action_name': 'generate_net_errors_java', | |
| 2112 'inputs': [ | |
| 2113 'android/java/net_errors_java.template', | |
| 2114 ], | |
| 2115 'outputs': [ | |
| 2116 '<(SHARED_INTERMEDIATE_DIR)/net/template/NetError.java', | |
|
Yaron
2012/09/07 01:05:44
I don't see where this java file gets compiled or
joth
2012/09/07 21:45:46
the 'additional_src_dirs' statement above shoves t
Yaron
2012/09/07 22:49:06
Right, thanks!
| |
| 2117 ], | |
| 2118 'action': [ | |
| 2119 'gcc', | |
| 2120 '-x', 'c-header', | |
| 2121 '-E', '-P', | |
| 2122 '-I', '..', | |
| 2123 '-o', | |
| 2124 '<@(_outputs)', | |
| 2125 '<@(_inputs)', | |
| 2126 ], | |
| 2127 'message': 'Preprocessing <(_inputs)', | |
| 2128 'process_outputs_as_sources': 1, | |
| 2129 }, | |
| 2130 ], | |
| 2131 }, | |
| 2099 ], | 2132 ], |
| 2100 }], | 2133 }], |
| 2101 # Special target to wrap a gtest_target_type==shared_library | 2134 # Special target to wrap a gtest_target_type==shared_library |
| 2102 # net_unittests into an android apk for execution. | 2135 # net_unittests into an android apk for execution. |
| 2103 # See base.gyp for TODO(jrg)s about this strategy. | 2136 # See base.gyp for TODO(jrg)s about this strategy. |
| 2104 ['OS == "android" and gtest_target_type == "shared_library"', { | 2137 ['OS == "android" and gtest_target_type == "shared_library"', { |
| 2105 'targets': [ | 2138 'targets': [ |
| 2106 { | 2139 { |
| 2107 'target_name': 'net_unittests_apk', | 2140 'target_name': 'net_unittests_apk', |
| 2108 'type': 'none', | 2141 'type': 'none', |
| (...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 2174 '--result', '<@(_outputs)', | 2207 '--result', '<@(_outputs)', |
| 2175 '--isolate', 'net_unittests.isolate', | 2208 '--isolate', 'net_unittests.isolate', |
| 2176 ], | 2209 ], |
| 2177 }, | 2210 }, |
| 2178 ], | 2211 ], |
| 2179 }, | 2212 }, |
| 2180 ], | 2213 ], |
| 2181 }], | 2214 }], |
| 2182 ], | 2215 ], |
| 2183 } | 2216 } |
| OLD | NEW |