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 '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 26 matching lines...) Expand all Loading... | |
| 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 # TODO(dmikurube): Kill android_use_tcmalloc. http://crbug.com/345554 | 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 [ '(use_allocator!="none" and use_allocator!="see_use_tcmalloc") or (use _allocator=="see_use_tcmalloc" and android_use_tcmalloc==1)', { |
| 44 'dependencies': [ | 44 'dependencies': [ |
| 45 '../base/allocator/allocator.gyp:allocator', ], | 45 '../base/allocator/allocator.gyp:allocator', ], |
| 46 }], | 46 }], |
| 47 ['OS=="android"', { | |
| 48 'ldflags': [ | |
| 49 # Some android targets depend on --gc-sections to link. | |
| 50 # Force --gc-sections also for Debug builds (see crbug.com/159847). | |
| 51 '-Wl,--gc-sections', | |
|
Nico
2014/04/11 20:36:59
The idea is to remove this too eventually, right (
Primiano Tucci (use gerrit)
2014/04/12 10:26:00
Right. However the chrome layer on Android is damn
| |
| 52 ], | |
| 53 }], | |
| 47 ], | 54 ], |
| 48 }, | 55 }, |
| 49 { | 56 { |
| 50 'target_name': 'chrome_shell_apk', | 57 'target_name': 'chrome_shell_apk', |
| 51 'type': 'none', | 58 'type': 'none', |
| 52 'dependencies': [ | 59 'dependencies': [ |
| 53 'chrome_java', | 60 'chrome_java', |
| 54 'chrome_shell_paks', | 61 'chrome_shell_paks', |
| 55 'libchromeshell', | 62 'libchromeshell', |
| 56 '../media/media.gyp:media_java', | 63 '../media/media.gyp:media_java', |
| (...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 125 { | 132 { |
| 126 'destination': '<(chrome_android_pak_output_folder)', | 133 'destination': '<(chrome_android_pak_output_folder)', |
| 127 'files': [ | 134 'files': [ |
| 128 '<@(chrome_android_pak_input_resources)', | 135 '<@(chrome_android_pak_input_resources)', |
| 129 ], | 136 ], |
| 130 } | 137 } |
| 131 ], | 138 ], |
| 132 }, | 139 }, |
| 133 ], | 140 ], |
| 134 } | 141 } |
| OLD | NEW |