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

Side by Side Diff: chrome/android/chrome_apk.gyp

Issue 1156363002: Add chrome_public_apk and chrome_public_test_apk targets in GN. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase agagin Created 5 years, 6 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/android/BUILD.gn ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright 2015 The Chromium Authors. All rights reserved. 1 # Copyright 2015 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 'includes': [ 5 'includes': [
6 '../../chrome/chrome_android_paks.gypi', # Included for the list of pak reso urces. 6 '../../chrome/chrome_android_paks.gypi', # Included for the list of pak reso urces.
7 '../../build/util/version.gypi' 7 '../../build/util/version.gypi'
8 ], 8 ],
9 'variables': { 9 'variables': {
10 'chromium_code': 1, 10 'chromium_code': 1,
(...skipping 173 matching lines...) Expand 10 before | Expand all | Expand 10 after
184 '<(DEPTH)/chrome/chrome.gyp:chrome_java', 184 '<(DEPTH)/chrome/chrome.gyp:chrome_java',
185 '<(DEPTH)/chrome/chrome.gyp:chrome_java_test_support', 185 '<(DEPTH)/chrome/chrome.gyp:chrome_java_test_support',
186 '<(DEPTH)/content/content_shell_and_tests.gyp:content_java_test_support' , 186 '<(DEPTH)/content/content_shell_and_tests.gyp:content_java_test_support' ,
187 '<(DEPTH)/net/net.gyp:net_java', 187 '<(DEPTH)/net/net.gyp:net_java',
188 '<(DEPTH)/net/net.gyp:net_java_test_support', 188 '<(DEPTH)/net/net.gyp:net_java_test_support',
189 '<(DEPTH)/sync/sync.gyp:sync_java_test_support', 189 '<(DEPTH)/sync/sync.gyp:sync_java_test_support',
190 ], 190 ],
191 'includes': [ '../../build/java.gypi' ], 191 'includes': [ '../../build/java.gypi' ],
192 }, 192 },
193 { 193 {
194 # GN: //chrome/android:chrome_template_resources
194 'target_name': 'chrome_template_resources', 195 'target_name': 'chrome_template_resources',
195 'type': 'none', 196 'type': 'none',
196 'variables': { 197 'variables': {
197 'jinja_inputs_base_dir': '<(chrome_java_dir)/res_template', 198 'jinja_inputs_base_dir': '<(chrome_java_dir)/res_template',
198 'jinja_inputs': [ 199 'jinja_inputs': [
199 '<(jinja_inputs_base_dir)/xml/searchable.xml', 200 '<(jinja_inputs_base_dir)/xml/searchable.xml',
200 '<(jinja_inputs_base_dir)/xml/syncadapter.xml', 201 '<(jinja_inputs_base_dir)/xml/syncadapter.xml',
201 ], 202 ],
202 'jinja_outputs_zip': '<(PRODUCT_DIR)/res.java/<(_target_name).zip', 203 'jinja_outputs_zip': '<(PRODUCT_DIR)/res.java/<(_target_name).zip',
203 'jinja_variables': [ 204 'jinja_variables': [
204 'manifest_package=<(manifest_package)', 205 'manifest_package=<(manifest_package)',
205 ], 206 ],
206 }, 207 },
207 'all_dependent_settings': { 208 'all_dependent_settings': {
208 'variables': { 209 'variables': {
209 'additional_input_paths': ['<(jinja_outputs_zip)'], 210 'additional_input_paths': ['<(jinja_outputs_zip)'],
210 'dependencies_res_zip_paths': ['<(jinja_outputs_zip)'], 211 'dependencies_res_zip_paths': ['<(jinja_outputs_zip)'],
211 }, 212 },
212 }, 213 },
213 'includes': [ '../../build/android/jinja_template.gypi' ], 214 'includes': [ '../../build/android/jinja_template.gypi' ],
214 }, 215 },
215 { 216 {
217 # GN: //chrome/android:hosted_service_aidl
216 'target_name': 'hosted_service_aidl', 218 'target_name': 'hosted_service_aidl',
217 'type': 'none', 219 'type': 'none',
218 'variables': { 220 'variables': {
219 'aidl_interface_file': '<(chrome_java_dir)/src/org/chromium/chrome/brows er/hosted/common.aidl', 221 'aidl_interface_file': '<(chrome_java_dir)/src/org/chromium/chrome/brows er/hosted/common.aidl',
220 'aidl_import_include': '<(chrome_java_dir)/src/org/chromium/chrome/brows er/hosted', 222 'aidl_import_include': '<(chrome_java_dir)/src/org/chromium/chrome/brows er/hosted',
221 }, 223 },
222 'sources': [ 224 'sources': [
223 '<(chrome_java_dir)/src/org/chromium/chrome/browser/hosted/IBrowserConne ctionCallback.aidl', 225 '<(chrome_java_dir)/src/org/chromium/chrome/browser/hosted/IBrowserConne ctionCallback.aidl',
224 '<(chrome_java_dir)/src/org/chromium/chrome/browser/hosted/IBrowserConne ctionService.aidl', 226 '<(chrome_java_dir)/src/org/chromium/chrome/browser/hosted/IBrowserConne ctionService.aidl',
225 ], 227 ],
226 'includes': [ '../../build/java_aidl.gypi' ], 228 'includes': [ '../../build/java_aidl.gypi' ],
227 }, 229 },
228 { 230 {
229 # GN: TODO 231 # GN: //chrome/android:chrome_public
230 'target_name': 'libchrome_public', 232 'target_name': 'libchrome_public',
231 'type': 'shared_library', 233 'type': 'shared_library',
232 'dependencies': [ 234 'dependencies': [
233 'libchrome_staging', 235 'libchrome_staging',
234 '<(DEPTH)/chrome/chrome.gyp:chrome_android_core', 236 '<(DEPTH)/chrome/chrome.gyp:chrome_android_core',
235 ], 237 ],
236 'include_dirs': [ 238 'include_dirs': [
237 '<(DEPTH)', 239 '<(DEPTH)',
238 ], 240 ],
239 'sources': [ 241 'sources': [
(...skipping 22 matching lines...) Expand all
262 ], 264 ],
263 }], # order_profiling!=0 265 }], # order_profiling!=0
264 ['use_allocator!="none"', { 266 ['use_allocator!="none"', {
265 'dependencies': [ 267 'dependencies': [
266 '<(DEPTH)/base/allocator/allocator.gyp:allocator', 268 '<(DEPTH)/base/allocator/allocator.gyp:allocator',
267 ], 269 ],
268 }], 270 }],
269 ], 271 ],
270 }, 272 },
271 { 273 {
274 # GN: //chrome/android:chrome_public_apk_manifest
272 'target_name': 'chrome_public_manifest', 275 'target_name': 'chrome_public_manifest',
273 'type': 'none', 276 'type': 'none',
274 'variables': { 277 'variables': {
275 'jinja_inputs': ['<(chrome_java_dir)/AndroidManifest.xml'], 278 'jinja_inputs': ['<(chrome_java_dir)/AndroidManifest.xml'],
276 'jinja_output': '<(chrome_public_apk_manifest)', 279 'jinja_output': '<(chrome_public_apk_manifest)',
277 'jinja_variables': [ 280 'jinja_variables': [
278 'channel=<(android_channel)', 281 'channel=<(android_channel)',
279 'configuration_policy=<(configuration_policy)', 282 'configuration_policy=<(configuration_policy)',
280 'manifest_package=<(manifest_package)', 283 'manifest_package=<(manifest_package)',
281 'min_sdk_version=16', 284 'min_sdk_version=16',
282 ], 285 ],
283 }, 286 },
284 'includes': [ '../../build/android/jinja_template.gypi' ], 287 'includes': [ '../../build/android/jinja_template.gypi' ],
285 }, 288 },
286 { 289 {
290 # GN: //chrome/android:chrome_public_apk
287 'target_name': 'chrome_public_apk', 291 'target_name': 'chrome_public_apk',
288 'type': 'none', 292 'type': 'none',
289 'variables': { 293 'variables': {
290 'android_manifest_path': '<(chrome_public_apk_manifest)', 294 'android_manifest_path': '<(chrome_public_apk_manifest)',
291 'apk_name': 'ChromePublic', 295 'apk_name': 'ChromePublic',
292 'native_lib_target': 'libchrome_public', 296 'native_lib_target': 'libchrome_public',
293 'java_in_dir': '<(chrome_java_dir)', 297 'java_in_dir': '<(chrome_java_dir)',
294 'conditions': [ 298 'conditions': [
295 # Only attempt loading the library from the APK for 64 bit devices 299 # Only attempt loading the library from the APK for 64 bit devices
296 # until the number of 32 bit devices which don't support this 300 # until the number of 32 bit devices which don't support this
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after
362 '<(DEPTH)/components/components.gyp:web_contents_delegate_android_java', 366 '<(DEPTH)/components/components.gyp:web_contents_delegate_android_java',
363 '<(DEPTH)/content/content_shell_and_tests.gyp:content_java_test_support' , 367 '<(DEPTH)/content/content_shell_and_tests.gyp:content_java_test_support' ,
364 '<(DEPTH)/net/net.gyp:net_java', 368 '<(DEPTH)/net/net.gyp:net_java',
365 '<(DEPTH)/net/net.gyp:net_java_test_support', 369 '<(DEPTH)/net/net.gyp:net_java_test_support',
366 '<(DEPTH)/sync/sync.gyp:sync_java_test_support', 370 '<(DEPTH)/sync/sync.gyp:sync_java_test_support',
367 '<(DEPTH)/third_party/android_tools/android_tools.gyp:android_support_v7 _appcompat_javalib', 371 '<(DEPTH)/third_party/android_tools/android_tools.gyp:android_support_v7 _appcompat_javalib',
368 ], 372 ],
369 'includes': [ '../../build/java.gypi' ], 373 'includes': [ '../../build/java.gypi' ],
370 }, 374 },
371 { 375 {
372 # GN: None. This will most likely be merged with chrome_shell before GN is 376 # GN: //chrome/android:chrome_public_test_apk_manifest
373 # done.
374 'target_name': 'chrome_public_test_apk_manifest', 377 'target_name': 'chrome_public_test_apk_manifest',
375 'type': 'none', 378 'type': 'none',
376 'variables': { 379 'variables': {
377 'jinja_inputs': ['<(chrome_java_tests_dir)/AndroidManifest.xml'], 380 'jinja_inputs': ['<(chrome_java_tests_dir)/AndroidManifest.xml'],
378 'jinja_output': '<(chrome_public_test_apk_manifest)', 381 'jinja_output': '<(chrome_public_test_apk_manifest)',
379 'jinja_variables': [ 382 'jinja_variables': [
380 'manifest_package=<(manifest_package)', 383 'manifest_package=<(manifest_package)',
381 ], 384 ],
382 }, 385 },
383 'includes': [ '../../build/android/jinja_template.gypi' ], 386 'includes': [ '../../build/android/jinja_template.gypi' ],
384 }, 387 },
385 { 388 {
386 # GN: None. This will most likely be merged with chrome_shell before GN is 389 # GN: //chrome/android:chrome_public_test_apk
387 # done.
388 'target_name': 'chrome_public_test_apk', 390 'target_name': 'chrome_public_test_apk',
389 'type': 'none', 391 'type': 'none',
390 'dependencies': [ 392 'dependencies': [
391 'chrome_shared_test_java', 393 'chrome_shared_test_java',
392 'chrome_public_apk_java', 394 'chrome_public_apk_java',
393 ], 395 ],
394 'variables': { 396 'variables': {
395 'android_manifest_path': '<(chrome_public_test_apk_manifest)', 397 'android_manifest_path': '<(chrome_public_test_apk_manifest)',
396 'package_name': 'chrome_public_test', 398 'package_name': 'chrome_public_test',
397 'java_in_dir': '<(chrome_java_tests_dir)', 399 'java_in_dir': '<(chrome_java_tests_dir)',
398 'java_in_dir_suffix': '/src_dummy', 400 'java_in_dir_suffix': '/src_dummy',
399 'apk_name': 'ChromePublicTest', 401 'apk_name': 'ChromePublicTest',
400 'is_test_apk': 1, 402 'is_test_apk': 1,
401 }, 403 },
402 'includes': [ '../../build/java_apk.gypi' ], 404 'includes': [ '../../build/java_apk.gypi' ],
403 }, 405 },
404 ], 406 ],
405 } 407 }
406 408
407 # Local Variables: 409 # Local Variables:
408 # tab-width:2 410 # tab-width:2
409 # indent-tabs-mode:nil 411 # indent-tabs-mode:nil
410 # End: 412 # End:
411 # vim: set expandtab tabstop=2 shiftwidth=2: 413 # vim: set expandtab tabstop=2 shiftwidth=2:
OLDNEW
« no previous file with comments | « chrome/android/BUILD.gn ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698