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

Side by Side Diff: chrome/chrome_shell.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_browser.gypi ('k') | chrome/common/BUILD.gn » ('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 2014 The Chromium Authors. All rights reserved. 1 # Copyright 2014 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 # This GYPI allows independent customization of the chrome shell in a manner 5 # This GYPI allows independent customization of the chrome shell in a manner
6 # similar to content shell (in content_shell.gypi). Notably, this file does 6 # similar to content shell (in content_shell.gypi). Notably, this file does
7 # NOT contain chrome_android_core, which is independent of the chrome shell 7 # NOT contain chrome_android_core, which is independent of the chrome shell
8 # and should be separately customized. 8 # and should be separately customized.
9 { 9 {
10 'variables': { 10 'variables': {
11 'package_name': 'chrome_shell_apk', 11 'package_name': 'chrome_shell_apk',
12 }, 12 },
13 'targets': [ 13 'targets': [
14 { 14 {
15 # GN: //chrome/android:chrome_shell_base
15 'target_name': 'libchromeshell_base', 16 'target_name': 'libchromeshell_base',
16 'type': 'static_library', 17 'type': 'static_library',
17 'dependencies': [ 18 'dependencies': [
18 '../base/base.gyp:base', 19 '../base/base.gyp:base',
19 'chrome_android_core', 20 'chrome_android_core',
20 'chrome.gyp:browser_ui', 21 'chrome.gyp:browser_ui',
21 '../content/content.gyp:content_app_browser', 22 '../content/content.gyp:content_app_browser',
22 ], 23 ],
23 'sources': [ 24 'sources': [
24 'android/shell/chrome_shell_google_location_settings_helper.cc', 25 'android/shell/chrome_shell_google_location_settings_helper.cc',
(...skipping 19 matching lines...) Expand all
44 'ldflags': [ 45 'ldflags': [
45 # Some android targets still depend on --gc-sections to link. 46 # Some android targets still depend on --gc-sections to link.
46 # TODO: remove --gc-sections for Debug builds (crbug.com/159847). 47 # TODO: remove --gc-sections for Debug builds (crbug.com/159847).
47 '-Wl,--gc-sections', 48 '-Wl,--gc-sections',
48 ], 49 ],
49 }, 50 },
50 }], 51 }],
51 ], 52 ],
52 }, 53 },
53 { 54 {
55 # GN: //chrome/android:chrome_shell
54 'target_name': 'libchromeshell', 56 'target_name': 'libchromeshell',
55 'type': 'shared_library', 57 'type': 'shared_library',
56 'sources': [ 58 'sources': [
57 # This file must always be included in the shared_library step to ensure 59 # This file must always be included in the shared_library step to ensure
58 # JNI_OnLoad is exported. 60 # JNI_OnLoad is exported.
59 'app/android/chrome_jni_onload.cc', 61 'app/android/chrome_jni_onload.cc',
60 'android/shell/chrome_main_delegate_chrome_shell_android.cc', 62 'android/shell/chrome_main_delegate_chrome_shell_android.cc',
61 'android/shell/chrome_main_delegate_chrome_shell_android.h', 63 'android/shell/chrome_main_delegate_chrome_shell_android.h',
62 ], 64 ],
63 'dependencies': [ 65 'dependencies': [
64 'libchromeshell_base', 66 'libchromeshell_base',
65 ], 67 ],
66 }, 68 },
67 { 69 {
70 # GN: //chrome/android:chrome_sync_shell
68 'target_name': 'libchromesyncshell', 71 'target_name': 'libchromesyncshell',
69 'type': 'shared_library', 72 'type': 'shared_library',
70 'sources': [ 73 'sources': [
71 # This file must always be included in the shared_library step to ensure 74 # This file must always be included in the shared_library step to ensure
72 # JNI_OnLoad is exported. 75 # JNI_OnLoad is exported.
73 'app/android/chrome_jni_onload.cc', 76 'app/android/chrome_jni_onload.cc',
74 'android/sync_shell/chrome_main_delegate_chrome_sync_shell_android.cc', 77 'android/sync_shell/chrome_main_delegate_chrome_sync_shell_android.cc',
75 'android/sync_shell/chrome_main_delegate_chrome_sync_shell_android.h', 78 'android/sync_shell/chrome_main_delegate_chrome_sync_shell_android.h',
76 ], 79 ],
77 'dependencies': [ 80 'dependencies': [
78 'libchromeshell_base', 81 'libchromeshell_base',
79 '../sync/sync.gyp:test_support_sync_fake_server_android', 82 '../sync/sync.gyp:test_support_sync_fake_server_android',
80 ], 83 ],
81 }, 84 },
82 { 85 {
86 # GN: //chrome/android:chrome_shell_apk
83 'target_name': 'chrome_shell_apk', 87 'target_name': 'chrome_shell_apk',
84 'type': 'none', 88 'type': 'none',
85 'dependencies': [ 89 'dependencies': [
86 'chrome_java', 90 'chrome_java',
87 'chrome_shell_paks', 91 'chrome_shell_paks',
88 'libchromeshell', 92 'libchromeshell',
89 '../media/media.gyp:media_java', 93 '../media/media.gyp:media_java',
90 ], 94 ],
91 'variables': { 95 'variables': {
92 'apk_name': 'ChromeShell', 96 'apk_name': 'ChromeShell',
93 'native_lib_version_name': '<(version_full)', 97 'native_lib_version_name': '<(version_full)',
94 'java_in_dir': 'android/shell/java', 98 'java_in_dir': 'android/shell/java',
95 'resource_dir': 'android/shell/res', 99 'resource_dir': 'android/shell/res',
96 'asset_location': '<(PRODUCT_DIR)/../assets/<(package_name)', 100 'asset_location': '<(PRODUCT_DIR)/../assets/<(package_name)',
97 'native_lib_target': 'libchromeshell', 101 'native_lib_target': 'libchromeshell',
98 'additional_input_paths': [ 102 'additional_input_paths': [
99 '<@(chrome_android_pak_output_resources)', 103 '<@(chrome_android_pak_output_resources)',
100 ], 104 ],
101 }, 105 },
102 'includes': [ '../build/java_apk.gypi', ], 106 'includes': [ '../build/java_apk.gypi', ],
103 }, 107 },
104 { 108 {
109 # GN: N/A
105 # chrome_shell_apk creates a .jar as a side effect. Any java targets 110 # chrome_shell_apk creates a .jar as a side effect. Any java targets
106 # that need that .jar in their classpath should depend on this target, 111 # that need that .jar in their classpath should depend on this target,
107 # chrome_shell_apk_java. Dependents of chrome_shell_apk receive its 112 # chrome_shell_apk_java. Dependents of chrome_shell_apk receive its
108 # jar path in the variable 'apk_output_jar_path'. 113 # jar path in the variable 'apk_output_jar_path'.
109 # This target should only be used by targets which instrument 114 # This target should only be used by targets which instrument
110 # chrome_shell_apk. 115 # chrome_shell_apk.
111 'target_name': 'chrome_shell_apk_java', 116 'target_name': 'chrome_shell_apk_java',
112 'type': 'none', 117 'type': 'none',
113 'dependencies': [ 118 'dependencies': [
114 'chrome_shell_apk', 119 'chrome_shell_apk',
(...skipping 10 matching lines...) Expand all
125 'copies': [ 130 'copies': [
126 { 131 {
127 'destination': '<(chrome_android_pak_output_folder)', 132 'destination': '<(chrome_android_pak_output_folder)',
128 'files': [ 133 'files': [
129 '<@(chrome_android_pak_input_resources)', 134 '<@(chrome_android_pak_input_resources)',
130 ], 135 ],
131 } 136 }
132 ], 137 ],
133 }, 138 },
134 { 139 {
140 # GN: //chrome/android:chrome_sync_shell_apk
135 'target_name': 'chrome_sync_shell_apk', 141 'target_name': 'chrome_sync_shell_apk',
136 'type': 'none', 142 'type': 'none',
137 'dependencies': [ 143 'dependencies': [
138 'chrome_java', 144 'chrome_java',
139 'chrome_shell_paks', 145 'chrome_shell_paks',
140 'libchromesyncshell', 146 'libchromesyncshell',
141 '../media/media.gyp:media_java', 147 '../media/media.gyp:media_java',
142 '../sync/sync.gyp:sync_java_test_support', 148 '../sync/sync.gyp:sync_java_test_support',
143 ], 149 ],
144 'variables': { 150 'variables': {
145 'apk_name': 'ChromeSyncShell', 151 'apk_name': 'ChromeSyncShell',
146 'android_manifest_path': 'android/sync_shell/java/AndroidManifest.xml', 152 'android_manifest_path': 'android/sync_shell/java/AndroidManifest.xml',
147 'R_package': 'org.chromium.chrome.shell', 153 'R_package': 'org.chromium.chrome.shell',
148 'native_lib_version_name': '<(version_full)', 154 'native_lib_version_name': '<(version_full)',
149 'java_in_dir': 'android/shell/java', 155 'java_in_dir': 'android/shell/java',
150 'resource_dir': 'android/shell/res', 156 'resource_dir': 'android/shell/res',
151 'asset_location': '<(PRODUCT_DIR)/../assets/<(package_name)', 157 'asset_location': '<(PRODUCT_DIR)/../assets/<(package_name)',
152 'native_lib_target': 'libchromesyncshell', 158 'native_lib_target': 'libchromesyncshell',
153 'additional_input_paths': [ 159 'additional_input_paths': [
154 '<@(chrome_android_pak_output_resources)', 160 '<@(chrome_android_pak_output_resources)',
155 ], 161 ],
156 }, 162 },
157 'includes': [ '../build/java_apk.gypi', ], 163 'includes': [ '../build/java_apk.gypi', ],
158 }, 164 },
159 { 165 {
166 # GN: N/A
160 # chrome_sync_shell_apk creates a .jar as a side effect. Any java 167 # chrome_sync_shell_apk creates a .jar as a side effect. Any java
161 # targets that need that .jar in their classpath should depend on this 168 # targets that need that .jar in their classpath should depend on this
162 # target. Dependents of chrome_sync_shell_apk receive its jar path in the 169 # target. Dependents of chrome_sync_shell_apk receive its jar path in the
163 # variable 'apk_output_jar_path'. This target should only be used by 170 # variable 'apk_output_jar_path'. This target should only be used by
164 # targets which instrument chrome_sync_shell_apk. 171 # targets which instrument chrome_sync_shell_apk.
165 'target_name': 'chrome_sync_shell_apk_java', 172 'target_name': 'chrome_sync_shell_apk_java',
166 'type': 'none', 173 'type': 'none',
167 'dependencies': [ 174 'dependencies': [
168 'chrome_sync_shell_apk', 175 'chrome_sync_shell_apk',
169 ], 176 ],
170 'includes': [ '../build/apk_fake_jar.gypi' ], 177 'includes': [ '../build/apk_fake_jar.gypi' ],
171 }, 178 },
172 ], 179 ],
173 180
174 } 181 }
OLDNEW
« no previous file with comments | « chrome/chrome_browser.gypi ('k') | chrome/common/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698