Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(450)

Side by Side Diff: chrome/chrome_android.gypi

Issue 570203002: Make chrome_shell_apk build (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@gn-chrome-jamesr
Patch Set: Rebase add chrome_version_java/page_connection_info_javagen Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « chrome/chrome.gyp ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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. 16 'chrome_android_paks.gypi', # Included for the list of pak resources.
17 'chrome_shell.gypi', # Built atop chrome_android_core (defined here) 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 'target_name': 'chrome_android_core', 22 'target_name': 'chrome_android_core',
22 'type': 'static_library', 23 'type': 'static_library',
23 'dependencies': [ 24 'dependencies': [
24 'chrome.gyp:browser', 25 'chrome.gyp:browser',
25 'chrome.gyp:browser_ui', 26 'chrome.gyp:browser_ui',
26 'chrome.gyp:plugin', 27 'chrome.gyp:plugin',
27 'chrome.gyp:renderer', 28 'chrome.gyp:renderer',
28 'chrome.gyp:utility', 29 'chrome.gyp:utility',
29 # TODO(kkimlabs): Move this to chrome.gyp:browser when the dependent 30 # TODO(kkimlabs): Move this to chrome.gyp:browser when the dependent
30 # is upstreamed. 31 # is upstreamed.
(...skipping 14 matching lines...) Expand all
45 'app/chrome_main_delegate.h', 46 'app/chrome_main_delegate.h',
46 ], 47 ],
47 'link_settings': { 48 'link_settings': {
48 'libraries': [ 49 'libraries': [
49 '-landroid', 50 '-landroid',
50 '-ljnigraphics', 51 '-ljnigraphics',
51 ], 52 ],
52 }, 53 },
53 }, 54 },
54 { 55 {
56 # GYP: //chrome/android:chrome_version_java
55 'target_name': 'chrome_version_java', 57 'target_name': 'chrome_version_java',
56 'type': 'none', 58 'type': 'none',
57 'variables': { 59 'variables': {
58 'template_input_path': 'android/java/ChromeVersionConstants.java.version ', 60 'template_input_path': 'android/java/ChromeVersionConstants.java.version ',
59 'version_path': 'VERSION', 61 'version_path': 'VERSION',
60 'version_py_path': '<(DEPTH)/build/util/version.py', 62 'version_py_path': '<(DEPTH)/build/util/version.py',
61 'output_path': '<(SHARED_INTERMEDIATE_DIR)/templates/<(_target_name)/org /chromium/chrome/browser/ChromeVersionConstants.java', 63 'output_path': '<(SHARED_INTERMEDIATE_DIR)/templates/<(_target_name)/org /chromium/chrome/browser/ChromeVersionConstants.java',
62 64
63 'conditions': [ 65 'conditions': [
64 ['branding == "Chrome"', { 66 ['branding == "Chrome"', {
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
99 '-f', '<(version_path)', 101 '-f', '<(version_path)',
100 '-f', '<(branding_path)', 102 '-f', '<(branding_path)',
101 '<(template_input_path)', 103 '<(template_input_path)',
102 '<(output_path)', 104 '<(output_path)',
103 ], 105 ],
104 }, 106 },
105 ], 107 ],
106 }, 108 },
107 ], 109 ],
108 } 110 }
OLDNEW
« no previous file with comments | « chrome/chrome.gyp ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698