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

Side by Side Diff: chrome/chrome.gyp

Issue 1200583002: Revert "Android: Store language .pak files in res/raw rather than assets" (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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
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 7
8 # Define the common dependencies that contain all the actual 8 # Define the common dependencies that contain all the actual
9 # Chromium functionality. This list gets pulled in below by 9 # Chromium functionality. This list gets pulled in below by
10 # the link of the actual chrome (or chromium) executable on 10 # the link of the actual chrome (or chromium) executable on
(...skipping 557 matching lines...) Expand 10 before | Expand all | Expand 10 after
568 }], # chromeos==1 568 }], # chromeos==1
569 ['OS=="android"', 569 ['OS=="android"',
570 { 570 {
571 'targets': [ 571 'targets': [
572 { 572 {
573 # GN: //chrome/android:chrome_java 573 # GN: //chrome/android:chrome_java
574 'target_name': 'chrome_java', 574 'target_name': 'chrome_java',
575 'type': 'none', 575 'type': 'none',
576 'dependencies': [ 576 'dependencies': [
577 'activity_type_ids_java', 577 'activity_type_ids_java',
578 'chrome_locale_paks',
579 'chrome_resources.gyp:chrome_strings', 578 'chrome_resources.gyp:chrome_strings',
580 'chrome_strings_grd', 579 'chrome_strings_grd',
581 'chrome_version_java', 580 'chrome_version_java',
582 'connection_security_security_levels_java', 581 'connection_security_security_levels_java',
583 'document_tab_model_info_proto_java', 582 'document_tab_model_info_proto_java',
584 'profile_account_management_metrics_java', 583 'profile_account_management_metrics_java',
585 'content_setting_java', 584 'content_setting_java',
586 'content_settings_type_java', 585 'content_settings_type_java',
587 'page_info_connection_type_java', 586 'page_info_connection_type_java',
588 'profile_sync_service_model_type_selection_java', 587 'profile_sync_service_model_type_selection_java',
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
638 'target_name': 'chrome_strings_grd', 637 'target_name': 'chrome_strings_grd',
639 'type': 'none', 638 'type': 'none',
640 'variables': { 639 'variables': {
641 'grd_file': '../chrome/android/java/strings/android_chrome_strings.g rd', 640 'grd_file': '../chrome/android/java/strings/android_chrome_strings.g rd',
642 }, 641 },
643 'includes': [ 642 'includes': [
644 '../build/java_strings_grd.gypi', 643 '../build/java_strings_grd.gypi',
645 ], 644 ],
646 }, 645 },
647 { 646 {
648 # GN: //chrome/android:chrome_locale_paks
649 'target_name': 'chrome_locale_paks',
650 'type': 'none',
651 'variables': {
652 'locale_pak_files': [ '<@(chrome_android_pak_locale_resources)' ],
653 },
654 'includes': [
655 'chrome_android_paks.gypi',
656 '../build/android/locale_pak_resources.gypi',
657 ],
658 },
659 {
660 # GN: //chrome:content_setting_javagen 647 # GN: //chrome:content_setting_javagen
661 'target_name': 'content_setting_java', 648 'target_name': 'content_setting_java',
662 'type': 'none', 649 'type': 'none',
663 'variables': { 650 'variables': {
664 'source_file': '../components/content_settings/core/common/content_s ettings.h', 651 'source_file': '../components/content_settings/core/common/content_s ettings.h',
665 }, 652 },
666 'includes': [ '../build/android/java_cpp_enum.gypi' ], 653 'includes': [ '../build/android/java_cpp_enum.gypi' ],
667 }, 654 },
668 { 655 {
669 # GN: //chrome:content_settings_type_javagen 656 # GN: //chrome:content_settings_type_javagen
(...skipping 146 matching lines...) Expand 10 before | Expand all | Expand 10 after
816 '<(DEPTH)/third_party/kasko' 803 '<(DEPTH)/third_party/kasko'
817 ], 804 ],
818 }, 805 },
819 }, 806 },
820 }, 807 },
821 }, 808 },
822 ], 809 ],
823 }], 810 }],
824 ], # 'conditions' 811 ], # 'conditions'
825 } 812 }
OLDNEW
« no previous file with comments | « chrome/android/shell/java/src/org/chromium/chrome/shell/ChromeShellApplication.java ('k') | chrome/chrome_android_paks.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698