| 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': 'chrome_shell_apk', | 7 'package_name': 'chrome_shell_apk', |
| 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 21 matching lines...) Expand all Loading... |
| 32 '../skia/config', | 32 '../skia/config', |
| 33 ], | 33 ], |
| 34 'conditions': [ | 34 'conditions': [ |
| 35 [ 'order_profiling!=0', { | 35 [ 'order_profiling!=0', { |
| 36 'conditions': [ | 36 'conditions': [ |
| 37 [ 'OS=="android"', { | 37 [ 'OS=="android"', { |
| 38 'dependencies': [ '../tools/cygprofile/cygprofile.gyp:cygprofile',
], | 38 'dependencies': [ '../tools/cygprofile/cygprofile.gyp:cygprofile',
], |
| 39 }], | 39 }], |
| 40 ], | 40 ], |
| 41 }], | 41 }], |
| 42 [ 'android_use_tcmalloc==1', { | 42 # TODO(dmikurube): Kill android_use_tcmalloc. http://crbug.com/345554 |
| 43 [ '(use_allocator!="none" and use_allocator!="see_use_tcmalloc") or (use
_allocator=="see_use_tcmalloc" and android_use_tcmalloc==1)', { |
| 43 'dependencies': [ | 44 'dependencies': [ |
| 44 '../base/allocator/allocator.gyp:allocator', ], | 45 '../base/allocator/allocator.gyp:allocator', ], |
| 45 }], | 46 }], |
| 46 ], | 47 ], |
| 47 }, | 48 }, |
| 48 { | 49 { |
| 49 'target_name': 'chrome_shell_apk', | 50 'target_name': 'chrome_shell_apk', |
| 50 'type': 'none', | 51 'type': 'none', |
| 51 'dependencies': [ | 52 'dependencies': [ |
| 52 'chrome_java', | 53 'chrome_java', |
| (...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 124 { | 125 { |
| 125 'destination': '<(chrome_android_pak_output_folder)', | 126 'destination': '<(chrome_android_pak_output_folder)', |
| 126 'files': [ | 127 'files': [ |
| 127 '<@(chrome_android_pak_input_resources)', | 128 '<@(chrome_android_pak_input_resources)', |
| 128 ], | 129 ], |
| 129 } | 130 } |
| 130 ], | 131 ], |
| 131 }, | 132 }, |
| 132 ], | 133 ], |
| 133 } | 134 } |
| OLD | NEW |