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

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

Issue 2345143002: Move language pak files to assets. (Closed)
Patch Set: Move language pak files back to assets rather than res. 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/common/features.gni") 10 import("//chrome/common/features.gni")
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
52 jinja_template("chrome_sync_shell_android_manifest") { 52 jinja_template("chrome_sync_shell_android_manifest") {
53 input = "java/AndroidManifest.xml" 53 input = "java/AndroidManifest.xml"
54 output = chrome_sync_shell_android_manifest 54 output = chrome_sync_shell_android_manifest
55 variables = chrome_sync_shell_jinja_variables 55 variables = chrome_sync_shell_jinja_variables
56 variables += [ 56 variables += [
57 "min_sdk_version=16", 57 "min_sdk_version=16",
58 "target_sdk_version=22", 58 "target_sdk_version=22",
59 ] 59 ]
60 } 60 }
61 61
62 locale_pak_resources("chrome_locale_paks") { 62 locale_pak_assets("chrome_locale_pak") {
63 sources = [ 63 sources = [
64 "$root_out_dir/locales/am.pak", 64 "$root_out_dir/locales/am.pak",
65 "$root_out_dir/locales/ar.pak", 65 "$root_out_dir/locales/ar.pak",
66 "$root_out_dir/locales/bg.pak", 66 "$root_out_dir/locales/bg.pak",
67 "$root_out_dir/locales/ca.pak", 67 "$root_out_dir/locales/ca.pak",
68 "$root_out_dir/locales/cs.pak", 68 "$root_out_dir/locales/cs.pak",
69 "$root_out_dir/locales/da.pak", 69 "$root_out_dir/locales/da.pak",
70 "$root_out_dir/locales/de.pak", 70 "$root_out_dir/locales/de.pak",
71 "$root_out_dir/locales/el.pak", 71 "$root_out_dir/locales/el.pak",
72 "$root_out_dir/locales/en-GB.pak", 72 "$root_out_dir/locales/en-GB.pak",
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
111 "//chrome:packed_resources", 111 "//chrome:packed_resources",
112 ] 112 ]
113 } 113 }
114 114
115 android_resources("chrome_java_resources") { 115 android_resources("chrome_java_resources") {
116 resource_dirs = [ 116 resource_dirs = [
117 "java/res", 117 "java/res",
118 "//chrome/android/java/res_chromium", 118 "//chrome/android/java/res_chromium",
119 ] 119 ]
120 deps = [ 120 deps = [
121 ":chrome_locale_paks",
122 ":chrome_strings_grd", 121 ":chrome_strings_grd",
123 "//chrome/app:java_strings_grd", 122 "//chrome/app:java_strings_grd",
124 "//components/policy:app_restrictions_resources", 123 "//components/policy:app_restrictions_resources",
125 "//components/strings:components_locale_settings_grd", 124 "//components/strings:components_locale_settings_grd",
126 "//components/strings:components_strings_grd", 125 "//components/strings:components_strings_grd",
127 "//content/public/android:content_java_resources", 126 "//content/public/android:content_java_resources",
128 "//third_party/android_data_chart:android_data_chart_java_resources", 127 "//third_party/android_data_chart:android_data_chart_java_resources",
129 "//third_party/android_media:android_media_resources", 128 "//third_party/android_media:android_media_resources",
130 "//third_party/android_tools:android_support_design_java", 129 "//third_party/android_tools:android_support_design_java",
131 "//third_party/android_tools:android_support_v7_appcompat_java", 130 "//third_party/android_tools:android_support_v7_appcompat_java",
(...skipping 118 matching lines...) Expand 10 before | Expand all | Expand 10 after
250 # Manifest used for linting (determining unused resources). 249 # Manifest used for linting (determining unused resources).
251 android_manifest = chrome_public_android_manifest 250 android_manifest = chrome_public_android_manifest
252 251
253 # TODO(sievers): Split java code into components. Not everything 252 # TODO(sievers): Split java code into components. Not everything
254 # is really all that UI related here. 253 # is really all that UI related here.
255 if (android_java_ui) { 254 if (android_java_ui) {
256 # From java_sources.gni. 255 # From java_sources.gni.
257 java_files = chrome_java_sources 256 java_files = chrome_java_sources
258 257
259 srcjar_deps += [ 258 srcjar_deps += [
259 ":chrome_locale_pak_srcjar",
260 "//chrome:page_info_connection_type_javagen", 260 "//chrome:page_info_connection_type_javagen",
261 "//chrome:website_settings_action_javagen", 261 "//chrome:website_settings_action_javagen",
262 "//components/browsing_data/core:browsing_data_utils_java", 262 "//components/browsing_data/core:browsing_data_utils_java",
263 "//components/infobars/core:infobar_enums_java", 263 "//components/infobars/core:infobar_enums_java",
264 "//components/ntp_snippets:ntp_snippets_java_enums_srcjar", 264 "//components/ntp_snippets:ntp_snippets_java_enums_srcjar",
265 "//components/ntp_tiles:ntp_tiles_enums_java", 265 "//components/ntp_tiles:ntp_tiles_enums_java",
266 "//components/offline_pages:offline_page_model_enums_java", 266 "//components/offline_pages:offline_page_model_enums_java",
267 "//components/omnibox/browser:autocomplete_match_javagen", 267 "//components/omnibox/browser:autocomplete_match_javagen",
268 "//components/omnibox/browser:autocomplete_match_type_javagen", 268 "//components/omnibox/browser:autocomplete_match_type_javagen",
269 "//components/security_state:security_state_enums_java", 269 "//components/security_state:security_state_enums_java",
(...skipping 217 matching lines...) Expand 10 before | Expand all | Expand 10 after
487 } 487 }
488 488
489 android_assets("chrome_public_apk_assets") { 489 android_assets("chrome_public_apk_assets") {
490 sources = [ 490 sources = [
491 "$root_out_dir/chrome_100_percent.pak", 491 "$root_out_dir/chrome_100_percent.pak",
492 "$root_out_dir/resources.pak", 492 "$root_out_dir/resources.pak",
493 ] 493 ]
494 disable_compression = true 494 disable_compression = true
495 495
496 deps = [ 496 deps = [
497 ":chrome_locale_pak_assets",
497 "//chrome:packed_extra_resources", 498 "//chrome:packed_extra_resources",
498 "//chrome:packed_resources", 499 "//chrome:packed_resources",
499 "//chrome/android/webapk/libs/runtime_library:runtime_library_assets", 500 "//chrome/android/webapk/libs/runtime_library:runtime_library_assets",
500 "//third_party/icu:icu_assets", 501 "//third_party/icu:icu_assets",
501 "//v8:v8_external_startup_data_assets", 502 "//v8:v8_external_startup_data_assets",
502 ] 503 ]
503 } 504 }
504 505
505 jinja_template_resources("chrome_public_apk_template_resources") { 506 jinja_template_resources("chrome_public_apk_template_resources") {
506 resources = [ 507 resources = [
(...skipping 187 matching lines...) Expand 10 before | Expand all | Expand 10 after
694 instrumentation_test_apk("chrome_sync_shell_test_apk") { 695 instrumentation_test_apk("chrome_sync_shell_test_apk") {
695 apk_name = "ChromeSyncShellTest" 696 apk_name = "ChromeSyncShellTest"
696 apk_under_test = ":chrome_sync_shell_apk" 697 apk_under_test = ":chrome_sync_shell_apk"
697 android_manifest = chrome_sync_shell_test_apk_manifest 698 android_manifest = chrome_sync_shell_test_apk_manifest
698 android_manifest_dep = ":chrome_sync_shell_test_apk_manifest" 699 android_manifest_dep = ":chrome_sync_shell_test_apk_manifest"
699 deps = [ 700 deps = [
700 ":chrome_sync_shell_test_apk_java", 701 ":chrome_sync_shell_test_apk_java",
701 ] 702 ]
702 proguard_enabled = !is_java_debug 703 proguard_enabled = !is_java_debug
703 } 704 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698