| 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 'package_name': 'chromium_testshell', | 7 'package_name': 'chromium_testshell', |
| 8 }, | 8 }, |
| 9 'includes': [ | 9 'includes': [ |
| 10 'chrome_android_paks.gypi', # Included for the list of pak resources. | 10 'chrome_android_paks.gypi', # Included for the list of pak resources. |
| (...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 71 { | 71 { |
| 72 # chromium_testshell creates a .jar as a side effect. Any java targets | 72 # chromium_testshell creates a .jar as a side effect. Any java targets |
| 73 # that need that .jar in their classpath should depend on this target, | 73 # that need that .jar in their classpath should depend on this target, |
| 74 # chromium_testshell_java. Dependents of chromium_testshell receive its | 74 # chromium_testshell_java. Dependents of chromium_testshell receive its |
| 75 # jar path in the variable 'apk_output_jar_path'. | 75 # jar path in the variable 'apk_output_jar_path'. |
| 76 'target_name': 'chromium_testshell_java', | 76 'target_name': 'chromium_testshell_java', |
| 77 'type': 'none', | 77 'type': 'none', |
| 78 'dependencies': [ | 78 'dependencies': [ |
| 79 'chromium_testshell', | 79 'chromium_testshell', |
| 80 ], | 80 ], |
| 81 # This all_dependent_settings is used for java targets only. This will add | 81 'includes': [ '../build/apk_fake_jar.gypi' ], |
| 82 # the chromium_testshell jar to the classpath of dependent java targets. | |
| 83 'all_dependent_settings': { | |
| 84 'variables': { | |
| 85 'input_jars_paths': ['>(apk_output_jar_path)'], | |
| 86 }, | |
| 87 }, | |
| 88 # Add an action with the appropriate output. This allows the generated | |
| 89 # buildfiles to determine which target the output corresponds to. | |
| 90 'actions': [ | |
| 91 { | |
| 92 'action_name': 'fake_generate_jar', | |
| 93 'inputs': [], | |
| 94 'outputs': ['>(apk_output_jar_path)'], | |
| 95 'action': [], | |
| 96 }, | |
| 97 ], | |
| 98 }, | 82 }, |
| 99 { | 83 { |
| 100 'target_name': 'chrome_android_core', | 84 'target_name': 'chrome_android_core', |
| 101 'type': 'static_library', | 85 'type': 'static_library', |
| 102 'dependencies': [ | 86 'dependencies': [ |
| 103 'chrome.gyp:browser', | 87 'chrome.gyp:browser', |
| 104 'chrome.gyp:browser_ui', | 88 'chrome.gyp:browser_ui', |
| 105 'chrome.gyp:plugin', | 89 'chrome.gyp:plugin', |
| 106 'chrome.gyp:renderer', | 90 'chrome.gyp:renderer', |
| 107 'chrome.gyp:utility', | 91 'chrome.gyp:utility', |
| (...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 140 'destination': '<(chrome_android_pak_output_folder)', | 124 'destination': '<(chrome_android_pak_output_folder)', |
| 141 'files': [ | 125 'files': [ |
| 142 '<@(chrome_android_pak_input_resources)', | 126 '<@(chrome_android_pak_input_resources)', |
| 143 '<(SHARED_INTERMEDIATE_DIR)/webkit/devtools_resources.pak', | 127 '<(SHARED_INTERMEDIATE_DIR)/webkit/devtools_resources.pak', |
| 144 ], | 128 ], |
| 145 } | 129 } |
| 146 ], | 130 ], |
| 147 }, | 131 }, |
| 148 ], | 132 ], |
| 149 } | 133 } |
| OLD | NEW |