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

Side by Side Diff: chrome/chrome.gyp

Issue 1158053005: 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: Revert always running deleteFiles() 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',
576 'chrome_resources.gyp:chrome_strings', 577 'chrome_resources.gyp:chrome_strings',
577 'chrome_strings_grd', 578 'chrome_strings_grd',
578 'chrome_version_java', 579 'chrome_version_java',
579 'connection_security_helper_security_levels_java', 580 'connection_security_helper_security_levels_java',
580 'document_tab_model_info_proto_java', 581 'document_tab_model_info_proto_java',
581 'profile_account_management_metrics_java', 582 'profile_account_management_metrics_java',
582 'content_setting_java', 583 'content_setting_java',
583 'content_settings_type_java', 584 'content_settings_type_java',
584 'page_info_connection_type_java', 585 'page_info_connection_type_java',
585 'profile_sync_service_model_type_selection_java', 586 'profile_sync_service_model_type_selection_java',
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
627 'target_name': 'chrome_strings_grd', 628 'target_name': 'chrome_strings_grd',
628 'type': 'none', 629 'type': 'none',
629 'variables': { 630 'variables': {
630 'grd_file': '../chrome/android/java/strings/android_chrome_strings.g rd', 631 'grd_file': '../chrome/android/java/strings/android_chrome_strings.g rd',
631 }, 632 },
632 'includes': [ 633 'includes': [
633 '../build/java_strings_grd.gypi', 634 '../build/java_strings_grd.gypi',
634 ], 635 ],
635 }, 636 },
636 { 637 {
638 # GN: //chrome/android:chrome_locale_paks
639 'target_name': 'chrome_locale_paks',
640 'type': 'none',
641 'variables': {
642 'locale_pak_files': [ '<@(chrome_android_pak_locale_resources)' ],
643 },
644 'includes': [
645 'chrome_android_paks.gypi',
646 '../build/android/locale_pak_resources.gypi',
647 ],
648 },
649 {
637 # GN: //chrome:content_setting_javagen 650 # GN: //chrome:content_setting_javagen
638 'target_name': 'content_setting_java', 651 'target_name': 'content_setting_java',
639 'type': 'none', 652 'type': 'none',
640 'variables': { 653 'variables': {
641 'source_file': '../components/content_settings/core/common/content_s ettings.h', 654 'source_file': '../components/content_settings/core/common/content_s ettings.h',
642 }, 655 },
643 'includes': [ '../build/android/java_cpp_enum.gypi' ], 656 'includes': [ '../build/android/java_cpp_enum.gypi' ],
644 }, 657 },
645 { 658 {
646 # GN: //chrome:content_settings_type_javagen 659 # GN: //chrome:content_settings_type_javagen
(...skipping 147 matching lines...) Expand 10 before | Expand all | Expand 10 after
794 '<(DEPTH)/third_party/kasko' 807 '<(DEPTH)/third_party/kasko'
795 ], 808 ],
796 }, 809 },
797 }, 810 },
798 }, 811 },
799 }, 812 },
800 ], 813 ],
801 }], 814 }],
802 ], # 'conditions' 815 ], # 'conditions'
803 } 816 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698