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

Side by Side Diff: chrome/chrome.gyp

Issue 1193113004: Revert of Android: Store language .pak files in res/raw rather than assets (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@load-from-apk-v8
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 555 matching lines...) Expand 10 before | Expand all | Expand 10 after
566 }], # chromeos==1 566 }], # chromeos==1
567 ['OS=="android"', 567 ['OS=="android"',
568 { 568 {
569 'targets': [ 569 'targets': [
570 { 570 {
571 # GN: //chrome/android:chrome_java 571 # GN: //chrome/android:chrome_java
572 'target_name': 'chrome_java', 572 'target_name': 'chrome_java',
573 'type': 'none', 573 'type': 'none',
574 'dependencies': [ 574 'dependencies': [
575 'activity_type_ids_java', 575 'activity_type_ids_java',
576 'chrome_locale_paks',
577 'chrome_resources.gyp:chrome_strings', 576 'chrome_resources.gyp:chrome_strings',
578 'chrome_strings_grd', 577 'chrome_strings_grd',
579 'chrome_version_java', 578 'chrome_version_java',
580 'connection_security_security_levels_java', 579 'connection_security_security_levels_java',
581 'document_tab_model_info_proto_java', 580 'document_tab_model_info_proto_java',
582 'profile_account_management_metrics_java', 581 'profile_account_management_metrics_java',
583 'content_setting_java', 582 'content_setting_java',
584 'content_settings_type_java', 583 'content_settings_type_java',
585 'page_info_connection_type_java', 584 'page_info_connection_type_java',
586 'profile_sync_service_model_type_selection_java', 585 'profile_sync_service_model_type_selection_java',
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
636 'target_name': 'chrome_strings_grd', 635 'target_name': 'chrome_strings_grd',
637 'type': 'none', 636 'type': 'none',
638 'variables': { 637 'variables': {
639 'grd_file': '../chrome/android/java/strings/android_chrome_strings.g rd', 638 'grd_file': '../chrome/android/java/strings/android_chrome_strings.g rd',
640 }, 639 },
641 'includes': [ 640 'includes': [
642 '../build/java_strings_grd.gypi', 641 '../build/java_strings_grd.gypi',
643 ], 642 ],
644 }, 643 },
645 { 644 {
646 # GN: //chrome/android:chrome_locale_paks
647 'target_name': 'chrome_locale_paks',
648 'type': 'none',
649 'variables': {
650 'locale_pak_files': [ '<@(chrome_android_pak_locale_resources)' ],
651 },
652 'includes': [
653 'chrome_android_paks.gypi',
654 '../build/android/locale_pak_resources.gypi',
655 ],
656 },
657 {
658 # GN: //chrome:content_setting_javagen 645 # GN: //chrome:content_setting_javagen
659 'target_name': 'content_setting_java', 646 'target_name': 'content_setting_java',
660 'type': 'none', 647 'type': 'none',
661 'variables': { 648 'variables': {
662 'source_file': '../components/content_settings/core/common/content_s ettings.h', 649 'source_file': '../components/content_settings/core/common/content_s ettings.h',
663 }, 650 },
664 'includes': [ '../build/android/java_cpp_enum.gypi' ], 651 'includes': [ '../build/android/java_cpp_enum.gypi' ],
665 }, 652 },
666 { 653 {
667 # GN: //chrome:content_settings_type_javagen 654 # GN: //chrome:content_settings_type_javagen
(...skipping 146 matching lines...) Expand 10 before | Expand all | Expand 10 after
814 '<(DEPTH)/third_party/kasko' 801 '<(DEPTH)/third_party/kasko'
815 ], 802 ],
816 }, 803 },
817 }, 804 },
818 }, 805 },
819 }, 806 },
820 ], 807 ],
821 }], 808 }],
822 ], # 'conditions' 809 ], # 'conditions'
823 } 810 }
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