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

Side by Side Diff: chrome/android/BUILD.gn

Issue 2345143002: Move language pak files to assets. (Closed)
Patch Set: Move resource initialization back to ChromeApplication Created 4 years, 3 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 2014 The Chromium Authors. All rights reserved. 1 # Copyright 2014 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 import("//build/config/android/config.gni") 5 import("//build/config/android/config.gni")
6 import("//build/config/android/rules.gni") 6 import("//build/config/android/rules.gni")
7 import("//build/util/process_version.gni") 7 import("//build/util/process_version.gni")
8 import("//build_overrides/v8.gni") 8 import("//build_overrides/v8.gni")
9 import("//chrome/android/chrome_public_apk_tmpl.gni") 9 import("//chrome/android/chrome_public_apk_tmpl.gni")
10 import("//chrome/chrome_paks.gni") 10 import("//chrome/chrome_paks.gni")
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
59 jinja_template("chrome_sync_shell_android_manifest") { 59 jinja_template("chrome_sync_shell_android_manifest") {
60 input = "java/AndroidManifest.xml" 60 input = "java/AndroidManifest.xml"
61 output = chrome_sync_shell_android_manifest 61 output = chrome_sync_shell_android_manifest
62 variables = chrome_sync_shell_jinja_variables 62 variables = chrome_sync_shell_jinja_variables
63 variables += [ 63 variables += [
64 "min_sdk_version=16", 64 "min_sdk_version=16",
65 "target_sdk_version=22", 65 "target_sdk_version=22",
66 ] 66 ]
67 } 67 }
68 68
69 locale_pak_resources("chrome_locale_paks") { 69 locale_pak_assets("chrome_locale_pak") {
70 sources = [ 70 sources = [
71 "$root_out_dir/locales/am.pak", 71 "$root_out_dir/locales/am.pak",
72 "$root_out_dir/locales/ar.pak", 72 "$root_out_dir/locales/ar.pak",
73 "$root_out_dir/locales/bg.pak", 73 "$root_out_dir/locales/bg.pak",
74 "$root_out_dir/locales/ca.pak", 74 "$root_out_dir/locales/ca.pak",
75 "$root_out_dir/locales/cs.pak", 75 "$root_out_dir/locales/cs.pak",
76 "$root_out_dir/locales/da.pak", 76 "$root_out_dir/locales/da.pak",
77 "$root_out_dir/locales/de.pak", 77 "$root_out_dir/locales/de.pak",
78 "$root_out_dir/locales/el.pak", 78 "$root_out_dir/locales/el.pak",
79 "$root_out_dir/locales/en-GB.pak", 79 "$root_out_dir/locales/en-GB.pak",
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
118 "//chrome:packed_resources", 118 "//chrome:packed_resources",
119 ] 119 ]
120 } 120 }
121 121
122 android_resources("chrome_java_resources") { 122 android_resources("chrome_java_resources") {
123 resource_dirs = [ 123 resource_dirs = [
124 "java/res", 124 "java/res",
125 "//chrome/android/java/res_chromium", 125 "//chrome/android/java/res_chromium",
126 ] 126 ]
127 deps = [ 127 deps = [
128 ":chrome_locale_paks",
129 ":chrome_strings_grd", 128 ":chrome_strings_grd",
130 "//chrome/app:java_strings_grd", 129 "//chrome/app:java_strings_grd",
131 "//components/policy:app_restrictions_resources", 130 "//components/policy:app_restrictions_resources",
132 "//components/strings:components_locale_settings_grd", 131 "//components/strings:components_locale_settings_grd",
133 "//components/strings:components_strings_grd", 132 "//components/strings:components_strings_grd",
134 "//content/public/android:content_java_resources", 133 "//content/public/android:content_java_resources",
135 "//third_party/android_data_chart:android_data_chart_java_resources", 134 "//third_party/android_data_chart:android_data_chart_java_resources",
136 "//third_party/android_media:android_media_resources", 135 "//third_party/android_media:android_media_resources",
137 "//third_party/android_tools:android_support_design_java", 136 "//third_party/android_tools:android_support_design_java",
138 "//third_party/android_tools:android_support_v7_appcompat_java", 137 "//third_party/android_tools:android_support_v7_appcompat_java",
(...skipping 117 matching lines...) Expand 10 before | Expand all | Expand 10 after
256 255
257 # Manifest used for linting (determining unused resources). 256 # Manifest used for linting (determining unused resources).
258 android_manifest = chrome_public_android_manifest 257 android_manifest = chrome_public_android_manifest
259 258
260 # TODO(sievers): Split java code into components. Not everything 259 # TODO(sievers): Split java code into components. Not everything
261 # is really all that UI related here. 260 # is really all that UI related here.
262 if (android_java_ui) { 261 if (android_java_ui) {
263 # From java_sources.gni. 262 # From java_sources.gni.
264 java_files = chrome_java_sources 263 java_files = chrome_java_sources
265 264
265 # Allow downstream targets to specify their own locale pak files.
266 jar_excluded_patterns += [ "*/LocalePakFiles.class" ]
267
266 srcjar_deps += [ 268 srcjar_deps += [
269 ":chrome_locale_pak_srcjar",
267 "//chrome:page_info_connection_type_javagen", 270 "//chrome:page_info_connection_type_javagen",
268 "//chrome:website_settings_action_javagen", 271 "//chrome:website_settings_action_javagen",
269 "//components/browsing_data/core:browsing_data_utils_java", 272 "//components/browsing_data/core:browsing_data_utils_java",
270 "//components/infobars/core:infobar_enums_java", 273 "//components/infobars/core:infobar_enums_java",
271 "//components/ntp_snippets:ntp_snippets_java_enums_srcjar", 274 "//components/ntp_snippets:ntp_snippets_java_enums_srcjar",
272 "//components/ntp_tiles:ntp_tiles_enums_java", 275 "//components/ntp_tiles:ntp_tiles_enums_java",
273 "//components/offline_pages:offline_page_model_enums_java", 276 "//components/offline_pages:offline_page_model_enums_java",
274 "//components/omnibox/browser:autocomplete_match_javagen", 277 "//components/omnibox/browser:autocomplete_match_javagen",
275 "//components/omnibox/browser:autocomplete_match_type_javagen", 278 "//components/omnibox/browser:autocomplete_match_type_javagen",
276 "//components/security_state:security_state_enums_java", 279 "//components/security_state:security_state_enums_java",
(...skipping 388 matching lines...) Expand 10 before | Expand all | Expand 10 after
665 "//components/sync:test_support_sync_fake_server_android", 668 "//components/sync:test_support_sync_fake_server_android",
666 ] 669 ]
667 } 670 }
668 671
669 # Contains rules common to chrome_public_apk and chrome_sync_shell_apk 672 # Contains rules common to chrome_public_apk and chrome_sync_shell_apk
670 template("chrome_public_apk_tmpl_shared") { 673 template("chrome_public_apk_tmpl_shared") {
671 chrome_public_apk_tmpl(target_name) { 674 chrome_public_apk_tmpl(target_name) {
672 forward_variables_from(invoker, "*") 675 forward_variables_from(invoker, "*")
673 676
674 native_lib_version_rule = "//build/util:chrome_version_json" 677 native_lib_version_rule = "//build/util:chrome_version_json"
675 678 srcjar_deps = [ ":chrome_locale_pak_srcjar" ]
676 deps += [ 679 deps += [
677 ":chrome_java", 680 ":chrome_java",
681 ":chrome_locale_pak_assets",
678 ":chrome_public_apk_assets", 682 ":chrome_public_apk_assets",
679 ":chrome_public_apk_resources", 683 ":chrome_public_apk_resources",
680 "//base:base_java", 684 "//base:base_java",
681 ] 685 ]
682 } 686 }
683 } 687 }
684 688
685 chrome_public_apk_tmpl_shared("chrome_public_apk") { 689 chrome_public_apk_tmpl_shared("chrome_public_apk") {
686 android_manifest = chrome_public_android_manifest 690 android_manifest = chrome_public_android_manifest
687 android_manifest_dep = ":chrome_public_android_manifest" 691 android_manifest_dep = ":chrome_public_android_manifest"
(...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after
772 instrumentation_test_apk("chrome_sync_shell_test_apk") { 776 instrumentation_test_apk("chrome_sync_shell_test_apk") {
773 apk_name = "ChromeSyncShellTest" 777 apk_name = "ChromeSyncShellTest"
774 apk_under_test = ":chrome_sync_shell_apk" 778 apk_under_test = ":chrome_sync_shell_apk"
775 android_manifest = chrome_sync_shell_test_apk_manifest 779 android_manifest = chrome_sync_shell_test_apk_manifest
776 android_manifest_dep = ":chrome_sync_shell_test_apk_manifest" 780 android_manifest_dep = ":chrome_sync_shell_test_apk_manifest"
777 deps = [ 781 deps = [
778 ":chrome_sync_shell_test_apk_java", 782 ":chrome_sync_shell_test_apk_java",
779 ] 783 ]
780 proguard_enabled = !is_java_debug 784 proguard_enabled = !is_java_debug
781 } 785 }
OLDNEW
« no previous file with comments | « build/config/android/rules.gni ('k') | chrome/android/java/src/org/chromium/chrome/browser/ChromeApplication.java » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698