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 ['component != "shared_library" and target_arch != "arm64" and target_arch != "x64" and profiling_full_stack_frames != 1', { | 8 ['component != "shared_library" and target_arch != "arm64" and target_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 }, | 14 }, |
| 15 'includes': [ | 15 'includes': [ |
| 16 'chrome_android_paks.gypi', # Included for the list of pak resources. | |
|
pval...(no longer on Chromium)
2014/08/09 00:48:21
This can't be included here anymore because two AP
pval...(no longer on Chromium)
2014/08/14 00:35:39
I've added this back as we can just reuse the reso
| |
| 17 'chrome_shell.gypi', # Built atop chrome_android_core (defined here) | 16 'chrome_shell.gypi', # Built atop chrome_android_core (defined here) |
| 18 ], | 17 ], |
| 19 'targets': [ | 18 'targets': [ |
| 20 { | 19 { |
| 21 'target_name': 'chrome_android_core', | 20 'target_name': 'chrome_android_core', |
| 22 'type': 'static_library', | 21 'type': 'static_library', |
| 23 'dependencies': [ | 22 'dependencies': [ |
| 24 'chrome.gyp:browser', | 23 'chrome.gyp:browser', |
| 25 'chrome.gyp:browser_ui', | 24 'chrome.gyp:browser_ui', |
| 26 'chrome.gyp:plugin', | 25 'chrome.gyp:plugin', |
| (...skipping 19 matching lines...) Expand all Loading... | |
| 46 ], | 45 ], |
| 47 'link_settings': { | 46 'link_settings': { |
| 48 'libraries': [ | 47 'libraries': [ |
| 49 '-landroid', | 48 '-landroid', |
| 50 '-ljnigraphics', | 49 '-ljnigraphics', |
| 51 ], | 50 ], |
| 52 }, | 51 }, |
| 53 }, | 52 }, |
| 54 ], | 53 ], |
| 55 } | 54 } |
| OLD | NEW |