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 'conditions': [ | 7 'conditions': [ |
| 8 ['android_must_copy_system_libraries == 0 and target_arch != "arm64" and t arget_arch != "x64" and profiling_full_stack_frames != 1', { | 8 ['android_must_copy_system_libraries == 0 and target_arch != "arm64" and t arget_arch != "x64" and profiling_full_stack_frames != 1', { |
| 9 # Only enable the chromium linker on regular builds, since the | 9 # Only enable the chromium linker on regular builds, since the |
| 10 # component build crashes on Android 4.4. See b/11379966 | 10 # component build crashes on Android 4.4. See b/11379966 |
| 11 'use_chromium_linker': '1', | 11 'use_chromium_linker': '1', |
| 12 }], | 12 }], |
| 13 ], | 13 ], |
| 14 'package_name': 'chrome_yay', | |
|
Ted C
2015/09/03 00:29:57
huh?
newt (away)
2015/09/03 01:09:09
Whoops: debugging code. Removed this, and fixed so
| |
| 14 }, | 15 }, |
| 15 'includes': [ | 16 'includes': [ |
| 16 'chrome_android_paks.gypi', # Included for the list of pak resources. | 17 'chrome_android_paks.gypi', # Included for the list of pak resources. |
| 17 'chrome_shell.gypi', # Built atop chrome_android_core (defined here) | |
| 18 ], | 18 ], |
| 19 'targets': [ | 19 'targets': [ |
| 20 { | 20 { |
| 21 # GN: //chrome:chrome_android_core | 21 # GN: //chrome:chrome_android_core |
| 22 'target_name': 'chrome_android_core', | 22 'target_name': 'chrome_android_core', |
| 23 'type': 'static_library', | 23 'type': 'static_library', |
| 24 'dependencies': [ | 24 'dependencies': [ |
| 25 'chrome.gyp:browser', | 25 'chrome.gyp:browser', |
| 26 'chrome.gyp:browser_ui', | 26 'chrome.gyp:browser_ui', |
| 27 'chrome.gyp:child', | 27 'chrome.gyp:child', |
| (...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 105 '-f', '<(branding_path)', | 105 '-f', '<(branding_path)', |
| 106 '-e', 'CHANNEL=str.upper("<(android_channel)")', | 106 '-e', 'CHANNEL=str.upper("<(android_channel)")', |
| 107 '<(template_input_path)', | 107 '<(template_input_path)', |
| 108 '<(output_path)', | 108 '<(output_path)', |
| 109 ], | 109 ], |
| 110 }, | 110 }, |
| 111 ], | 111 ], |
| 112 }, | 112 }, |
| 113 ], | 113 ], |
| 114 } | 114 } |
| OLD | NEW |