| 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 'variables': { | 5 'variables': { |
| 6 'chromium_code': 1, | 6 'chromium_code': 1, |
| 7 }, | 7 }, |
| 8 'includes': [ | 8 'includes': [ |
| 9 'chrome_android_paks.gypi', # Included for the list of pak resources. | 9 'chrome_android_paks.gypi', # Included for the list of pak resources. |
| 10 ], | 10 ], |
| (...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 87 # chromium_testshell creates a .jar as a side effect. Any java targets | 87 # chromium_testshell creates a .jar as a side effect. Any java targets |
| 88 # that need that .jar in their classpath should depend on this target, | 88 # that need that .jar in their classpath should depend on this target, |
| 89 # chromium_testshell_java. | 89 # chromium_testshell_java. |
| 90 'target_name': 'chromium_testshell_java', | 90 'target_name': 'chromium_testshell_java', |
| 91 'type': 'none', | 91 'type': 'none', |
| 92 'dependencies': [ | 92 'dependencies': [ |
| 93 '../media/media.gyp:media_java', | 93 '../media/media.gyp:media_java', |
| 94 'chrome.gyp:chrome_java', | 94 'chrome.gyp:chrome_java', |
| 95 'chromium_testshell', | 95 'chromium_testshell', |
| 96 ], | 96 ], |
| 97 'export_dependent_settings': [ | |
| 98 '../media/media.gyp:media_java', | |
| 99 'chrome.gyp:chrome_java', | |
| 100 ], | |
| 101 'outputs': [ | 97 'outputs': [ |
| 102 '<(PRODUCT_DIR)/lib.java/chromium_chromium_testshell.jar', | 98 '<(PRODUCT_DIR)/lib.java/chromium_chromium_testshell.jar', |
| 103 ], | 99 ], |
| 104 'direct_dependent_settings': { | 100 # This all_dependent_settings is used for java targets only. This will add |
| 101 # the chromium_testshell jar to the classpath of dependent java targets. |
| 102 'all_dependent_settings': { |
| 105 'variables': { | 103 'variables': { |
| 106 'input_jars_paths': ['<(PRODUCT_DIR)/lib.java/chromium_chromium_testsh
ell.jar'], | 104 'input_jars_paths': ['<(PRODUCT_DIR)/lib.java/chromium_chromium_testsh
ell.jar'], |
| 107 }, | 105 }, |
| 108 }, | 106 }, |
| 109 # Add an action with the appropriate output. This allows the generated | 107 # Add an action with the appropriate output. This allows the generated |
| 110 # buildfiles to determine which target the output corresponds to. | 108 # buildfiles to determine which target the output corresponds to. |
| 111 'actions': [ | 109 'actions': [ |
| 112 { | 110 { |
| 113 'action_name': 'fake_generate_jar', | 111 'action_name': 'fake_generate_jar', |
| 114 'inputs': [], | 112 'inputs': [], |
| (...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 157 ], | 155 ], |
| 158 'copies': [ | 156 'copies': [ |
| 159 { | 157 { |
| 160 'destination': '<(chrome_android_pak_output_folder)', | 158 'destination': '<(chrome_android_pak_output_folder)', |
| 161 'files': [ '<@(chrome_android_pak_input_resources)' ], | 159 'files': [ '<@(chrome_android_pak_input_resources)' ], |
| 162 } | 160 } |
| 163 ], | 161 ], |
| 164 }, | 162 }, |
| 165 ], | 163 ], |
| 166 } | 164 } |
| OLD | NEW |