| 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 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 42 [ 'android_use_tcmalloc==1', { | 42 [ 'android_use_tcmalloc==1', { |
| 43 'dependencies': [ | 43 'dependencies': [ |
| 44 '../base/allocator/allocator.gyp:allocator', ], | 44 '../base/allocator/allocator.gyp:allocator', ], |
| 45 }], | 45 }], |
| 46 ], | 46 ], |
| 47 }, | 47 }, |
| 48 { | 48 { |
| 49 'target_name': 'chromium_testshell', | 49 'target_name': 'chromium_testshell', |
| 50 'type': 'none', | 50 'type': 'none', |
| 51 'dependencies': [ | 51 'dependencies': [ |
| 52 'chrome_java', | 52 '../media/media.gyp:media_java', |
| 53 'chrome.gyp:chrome_java', |
| 53 'chromium_testshell_paks', | 54 'chromium_testshell_paks', |
| 54 'libchromiumtestshell', | 55 'libchromiumtestshell', |
| 55 '../components/components.gyp:dom_distiller_core_java', | |
| 56 '../media/media.gyp:media_java', | |
| 57 ], | 56 ], |
| 58 'variables': { | 57 'variables': { |
| 59 'apk_name': 'ChromiumTestShell', | 58 'apk_name': 'ChromiumTestShell', |
| 60 'manifest_package_name': 'org.chromium.chrome.shell', | 59 'manifest_package_name': 'org.chromium.chrome.shell', |
| 61 'java_in_dir': 'android/testshell/java', | 60 'java_in_dir': 'android/testshell/java', |
| 62 'resource_dir': 'android/shell/res', | 61 'resource_dir': 'android/shell/res', |
| 63 'asset_location': '<(PRODUCT_DIR)/../assets/<(package_name)', | 62 'asset_location': '<(PRODUCT_DIR)/../assets/<(package_name)', |
| 64 'native_lib_target': 'libchromiumtestshell', | 63 'native_lib_target': 'libchromiumtestshell', |
| 65 'native_lib_version_name': '<(version_full)', | 64 'native_lib_version_name': '<(version_full)', |
| 66 'additional_input_paths': [ | 65 'additional_input_paths': [ |
| (...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 123 { | 122 { |
| 124 'destination': '<(chrome_android_pak_output_folder)', | 123 'destination': '<(chrome_android_pak_output_folder)', |
| 125 'files': [ | 124 'files': [ |
| 126 '<@(chrome_android_pak_input_resources)', | 125 '<@(chrome_android_pak_input_resources)', |
| 127 ], | 126 ], |
| 128 } | 127 } |
| 129 ], | 128 ], |
| 130 }, | 129 }, |
| 131 ], | 130 ], |
| 132 } | 131 } |
| OLD | NEW |