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

Side by Side Diff: chrome/chrome_resources.gyp

Issue 1215303006: bluetooth: android: Initial BluetoothDeviceAndroid implementation. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@bta-discovery-
Patch Set: Merge TOT Created 5 years, 5 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
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 'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/chrome', 6 'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/chrome',
7 'about_credits_file': '<(SHARED_INTERMEDIATE_DIR)/about_credits.html', 7 'about_credits_file': '<(SHARED_INTERMEDIATE_DIR)/about_credits.html',
8 'additional_modules_list_file': '<(SHARED_INTERMEDIATE_DIR)/chrome/browser/i nternal/additional_modules_list.txt', 8 'additional_modules_list_file': '<(SHARED_INTERMEDIATE_DIR)/chrome/browser/i nternal/additional_modules_list.txt',
9 'omnibox_mojom_file': '<(SHARED_INTERMEDIATE_DIR)/chrome/browser/ui/webui/om nibox/omnibox.mojom.js', 9 'omnibox_mojom_file': '<(SHARED_INTERMEDIATE_DIR)/chrome/browser/ui/webui/om nibox/omnibox.mojom.js',
10 }, 10 },
(...skipping 384 matching lines...) Expand 10 before | Expand all | Expand 10 after
395 ], 395 ],
396 }, 396 },
397 ], 397 ],
398 }], 398 }],
399 ], 399 ],
400 }, 400 },
401 { 401 {
402 # GN version: //chrome:packed_resources 402 # GN version: //chrome:packed_resources
403 'target_name': 'packed_resources', 403 'target_name': 'packed_resources',
404 'type': 'none', 404 'type': 'none',
405 'dependencies': [ 405 'dependencies': [ # Update duplicate logic in repack_locales.py
406 # MSVS needs the dependencies explictly named, Make is able to 406 # MSVS needs the dependencies explictly named, Make is able to
407 # derive the dependencies from the output files. 407 # derive the dependencies from the output files.
408 'chrome_resources', 408 'chrome_resources',
409 'chrome_strings', 409 'chrome_strings',
410 'platform_locale_settings', 410 'platform_locale_settings',
411 'theme_resources', 411 'theme_resources',
412 '<(DEPTH)/components/components_strings.gyp:components_strings', 412 '<(DEPTH)/components/components_strings.gyp:components_strings',
413 '<(DEPTH)/net/net.gyp:net_resources', 413 '<(DEPTH)/net/net.gyp:net_resources',
414 '<(DEPTH)/ui/resources/ui_resources.gyp:ui_resources', 414 '<(DEPTH)/ui/resources/ui_resources.gyp:ui_resources',
415 '<(DEPTH)/ui/strings/ui_strings.gyp:ui_strings', 415 '<(DEPTH)/ui/strings/ui_strings.gyp:ui_strings',
(...skipping 23 matching lines...) Expand all
439 }, 439 },
440 { 440 {
441 'includes': ['chrome_repack_chrome_material_100_percent.gypi'] 441 'includes': ['chrome_repack_chrome_material_100_percent.gypi']
442 }, 442 },
443 { 443 {
444 'includes': ['chrome_repack_chrome_material_200_percent.gypi'] 444 'includes': ['chrome_repack_chrome_material_200_percent.gypi']
445 }, 445 },
446 ], 446 ],
447 'conditions': [ 447 'conditions': [
448 ['OS != "ios"', { 448 ['OS != "ios"', {
449 'dependencies': [ 449 'dependencies': [ # Update duplicate logic in repack_locales.py
450 '<(DEPTH)/content/app/resources/content_resources.gyp:content_resour ces', 450 '<(DEPTH)/content/app/resources/content_resources.gyp:content_resour ces',
451 '<(DEPTH)/content/app/strings/content_strings.gyp:content_strings', 451 '<(DEPTH)/content/app/strings/content_strings.gyp:content_strings',
452 '<(DEPTH)/device/bluetooth/bluetooth_strings.gyp:device_bluetooth_st rings',
452 '<(DEPTH)/third_party/WebKit/public/blink_resources.gyp:blink_resour ces', 453 '<(DEPTH)/third_party/WebKit/public/blink_resources.gyp:blink_resour ces',
453 ], 454 ],
454 }, { # else 455 }, { # else
455 'dependencies': [ 456 'dependencies': [ # Update duplicate logic in repack_locales.py
456 '<(DEPTH)/ios/chrome/ios_chrome_resources.gyp:ios_strings_resources_ gen', 457 '<(DEPTH)/ios/chrome/ios_chrome_resources.gyp:ios_strings_resources_ gen',
457 ], 458 ],
458 'actions': [ 459 'actions': [
459 { 460 {
460 'includes': ['chrome_repack_chrome_300_percent.gypi'] 461 'includes': ['chrome_repack_chrome_300_percent.gypi']
461 }, 462 },
462 ], 463 ],
463 }], 464 }],
464 ['use_ash==1', { 465 ['use_ash==1', {
465 'dependencies': [ 466 'dependencies': [ # Update duplicate logic in repack_locales.py
466 '<(DEPTH)/ash/ash_resources.gyp:ash_resources', 467 '<(DEPTH)/ash/ash_resources.gyp:ash_resources',
467 '<(DEPTH)/ash/ash_strings.gyp:ash_strings', 468 '<(DEPTH)/ash/ash_strings.gyp:ash_strings',
468 ], 469 ],
469 }], 470 }],
470 ['toolkit_views==1', { 471 ['toolkit_views==1', {
471 'dependencies': [ 472 'dependencies': [
472 '<(DEPTH)/ui/views/resources/views_resources.gyp:views_resources', 473 '<(DEPTH)/ui/views/resources/views_resources.gyp:views_resources',
473 ], 474 ],
474 }], 475 }],
475 ['chromeos==1', { 476 ['chromeos==1', {
476 'dependencies': [ 477 'dependencies': [ # Update duplicate logic in repack_locales.py
477 '<(DEPTH)/remoting/remoting.gyp:remoting_resources', 478 '<(DEPTH)/remoting/remoting.gyp:remoting_resources',
478 '<(DEPTH)/ui/chromeos/ui_chromeos.gyp:ui_chromeos_resources', 479 '<(DEPTH)/ui/chromeos/ui_chromeos.gyp:ui_chromeos_resources',
479 '<(DEPTH)/ui/chromeos/ui_chromeos.gyp:ui_chromeos_strings', 480 '<(DEPTH)/ui/chromeos/ui_chromeos.gyp:ui_chromeos_strings',
480 ], 481 ],
481 }], 482 }],
482 ['enable_autofill_dialog==1 and OS!="android"', { 483 ['enable_autofill_dialog==1 and OS!="android"', {
483 'dependencies': [ 484 'dependencies': [ # Update duplicate logic in repack_locales.py
484 '<(DEPTH)/third_party/libaddressinput/libaddressinput.gyp:libaddress input_strings', 485 '<(DEPTH)/third_party/libaddressinput/libaddressinput.gyp:libaddress input_strings',
485 ], 486 ],
486 }], 487 }],
487 ['enable_extensions==1', { 488 ['enable_extensions==1', {
488 'dependencies': [ 489 'dependencies': [ # Update duplicate logic in repack_locales.py
489 '<(DEPTH)/device/bluetooth/bluetooth_strings.gyp:device_bluetooth_st rings',
490 '<(DEPTH)/extensions/extensions_strings.gyp:extensions_strings', 490 '<(DEPTH)/extensions/extensions_strings.gyp:extensions_strings',
491 ], 491 ],
492 }], 492 }],
493 ['OS != "mac" and OS != "ios"', { 493 ['OS != "mac" and OS != "ios"', {
494 # Copy pak files to the product directory. These files will be picked 494 # Copy pak files to the product directory. These files will be picked
495 # up by the following installer scripts: 495 # up by the following installer scripts:
496 # - Windows: chrome/installer/mini_installer/chrome.release 496 # - Windows: chrome/installer/mini_installer/chrome.release
497 # - Linux: chrome/installer/linux/internal/common/installer.include 497 # - Linux: chrome/installer/linux/internal/common/installer.include
498 # Ensure that the above scripts are updated when adding or removing 498 # Ensure that the above scripts are updated when adding or removing
499 # pak files. 499 # pak files.
(...skipping 143 matching lines...) Expand 10 before | Expand all | Expand 10 after
643 '<(generator_path)', 643 '<(generator_path)',
644 'credits', 644 'credits',
645 '<(about_credits_file)', 645 '<(about_credits_file)',
646 ], 646 ],
647 'message': 'Generating about:credits', 647 'message': 'Generating about:credits',
648 }, 648 },
649 ], 649 ],
650 }, 650 },
651 ], # targets 651 ], # targets
652 } 652 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698