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 'includes': [ | 9 'includes': [ |
| 10 '../build/win_precompile.gypi', | 10 '../build/win_precompile.gypi', |
| (...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 108 }, | 108 }, |
| 109 'defines': [ | 109 'defines': [ |
| 110 'NACL_WIN64', | 110 'NACL_WIN64', |
| 111 ], | 111 ], |
| 112 # TODO(rvargas): Bug 78117. Remove this. | 112 # TODO(rvargas): Bug 78117. Remove this. |
| 113 'msvs_disabled_warnings': [ | 113 'msvs_disabled_warnings': [ |
| 114 4244, | 114 4244, |
| 115 ], | 115 ], |
| 116 }, | 116 }, |
| 117 { | 117 { |
| 118 'target_name': 'base_jni_headers', | |
| 119 'type': 'none', | |
| 120 'actions': [ | |
| 121 { | |
| 122 'action_name': 'generate_jni_headers', | |
|
Nico
2012/04/03 18:51:05
This isn't done conditionally, so a `make all` cre
| |
| 123 'inputs': [ | |
| 124 'android/jni_generator/jni_generator.py', | |
| 125 'android/java/org/chromium/base/PathUtils.java', | |
| 126 ], | |
| 127 'outputs': [ | |
| 128 '<(SHARED_INTERMEDIATE_DIR)/base/jni/path_utils_jni.h', | |
| 129 ], | |
| 130 'action': [ | |
| 131 'python', | |
| 132 'android/jni_generator/jni_generator.py', | |
| 133 '-o', | |
| 134 '<@(_inputs)', | |
|
Mark Mentovai
2012/03/13 20:16:21
Do you really want to pass jni_generator.py back i
Peter Beverloo
2012/03/13 20:18:50
As answered in PS3, per bulach@ this indeed is the
| |
| 135 '<@(_outputs)', | |
| 136 ], | |
| 137 } | |
| 138 ], | |
| 139 }, | |
| 140 { | |
| 118 'target_name': 'base_unittests', | 141 'target_name': 'base_unittests', |
| 119 'type': 'executable', | 142 'type': 'executable', |
| 120 'sources': [ | 143 'sources': [ |
| 121 # Infrastructure files. | 144 # Infrastructure files. |
| 122 'test/run_all_unittests.cc', | 145 'test/run_all_unittests.cc', |
| 123 | 146 |
| 124 # Tests. | 147 # Tests. |
| 125 'android/jni_android_unittest.cc', | 148 'android/jni_android_unittest.cc', |
| 126 'android/scoped_java_ref_unittest.cc', | 149 'android/scoped_java_ref_unittest.cc', |
| 127 'at_exit_unittest.cc', | 150 'at_exit_unittest.cc', |
| (...skipping 486 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 614 # treated as weak imports in dependents, who still must | 637 # treated as weak imports in dependents, who still must |
| 615 # #include closure_blocks_leopard_compat.h to get weak imports. | 638 # #include closure_blocks_leopard_compat.h to get weak imports. |
| 616 'type': 'none', | 639 'type': 'none', |
| 617 }], | 640 }], |
| 618 ], | 641 ], |
| 619 }, | 642 }, |
| 620 ], | 643 ], |
| 621 }], | 644 }], |
| 622 ], | 645 ], |
| 623 } | 646 } |
| OLD | NEW |