OLD | NEW |
---|---|
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_overrides/v8.gni") | 7 import("//build_overrides/v8.gni") |
8 import("//chrome/android/chrome_public_apk_tmpl.gni") | 8 import("//chrome/android/chrome_public_apk_tmpl.gni") |
9 import("//chrome/version.gni") | 9 import("//chrome/version.gni") |
10 import("//testing/test.gni") | 10 import("//testing/test.gni") |
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
44 | 44 |
45 # GYP: //chrome/chrome.gyp:chrome_java (resources part) | 45 # GYP: //chrome/chrome.gyp:chrome_java (resources part) |
46 android_resources("chrome_java_resources") { | 46 android_resources("chrome_java_resources") { |
47 resource_dirs = [ | 47 resource_dirs = [ |
48 "java/res", | 48 "java/res", |
49 "//chrome/android/java/res_chromium", | 49 "//chrome/android/java/res_chromium", |
50 ] | 50 ] |
51 deps = [ | 51 deps = [ |
52 ":chrome_locale_paks", | 52 ":chrome_locale_paks", |
53 ":chrome_strings_grd", | 53 ":chrome_strings_grd", |
54 "//chrome/app:java_strings_grd", | |
54 "//components/policy:app_restrictions_resources", | 55 "//components/policy:app_restrictions_resources", |
55 "//content/public/android:content_java_resources", | 56 "//content/public/android:content_java_resources", |
56 "//chrome/app:java_strings_grd", | |
57 "//third_party/android_data_chart:android_data_chart_java_resources", | 57 "//third_party/android_data_chart:android_data_chart_java_resources", |
58 "//third_party/android_media:android_media_resources", | 58 "//third_party/android_media:android_media_resources", |
59 ] | 59 ] |
60 if (!enable_configuration_policy) { | 60 if (!enable_configuration_policy) { |
61 deps -= [ "//components/policy:app_restrictions_resources" ] | 61 deps -= [ "//components/policy:app_restrictions_resources" ] |
62 } | 62 } |
63 custom_package = "org.chromium.chrome" | 63 custom_package = "org.chromium.chrome" |
64 } | 64 } |
65 | 65 |
66 # GYP: //chrome/chrome.gyp:chrome_strings_grd | 66 # GYP: //chrome/chrome.gyp:chrome_strings_grd |
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
108 "values-th/android_chrome_strings.xml", | 108 "values-th/android_chrome_strings.xml", |
109 "values-tr/android_chrome_strings.xml", | 109 "values-tr/android_chrome_strings.xml", |
110 "values-uk/android_chrome_strings.xml", | 110 "values-uk/android_chrome_strings.xml", |
111 "values-vi/android_chrome_strings.xml", | 111 "values-vi/android_chrome_strings.xml", |
112 "values-zh-rCN/android_chrome_strings.xml", | 112 "values-zh-rCN/android_chrome_strings.xml", |
113 "values-zh-rTW/android_chrome_strings.xml", | 113 "values-zh-rTW/android_chrome_strings.xml", |
114 ] | 114 ] |
115 } | 115 } |
116 | 116 |
117 # GYP: //chrome/chrome.gyp:chrome_java | 117 # GYP: //chrome/chrome.gyp:chrome_java |
118 android_library("chrome_java") { | 118 android_library("chrome_java") { |
no sievers
2015/11/25 22:54:29
i've not mirrored these changes to gyp, though i c
| |
119 deps = [ | 119 deps = [ |
120 ":chrome_java_resources", | |
121 ":document_tab_model_info_proto_java", | |
122 "//base:base_java", | 120 "//base:base_java", |
123 "//net/android:net_java", | |
124 "//components/bookmarks/common/android:bookmarks_java", | |
125 "//components/dom_distiller/android:dom_distiller_content_java", | |
126 "//components/dom_distiller/android:dom_distiller_core_java", | |
127 "//components/gcm_driver/android:gcm_driver_java", | |
128 "//components/invalidation/impl:java", | |
129 "//components/navigation_interception/android:navigation_interception_java", | |
130 "//components/policy/android:policy_java", | |
131 "//components/precache/android:precache_java", | |
132 "//components/safe_json/android:safe_json_java", | 121 "//components/safe_json/android:safe_json_java", |
133 "//components/service_tab_launcher:service_tab_launcher_java", | |
134 "//components/signin/core/browser/android:java", | |
135 "//components/variations/android:variations_java", | 122 "//components/variations/android:variations_java", |
136 "//components/web_contents_delegate_android:web_contents_delegate_android_ja va", | |
137 "//content/public/android:content_java", | 123 "//content/public/android:content_java", |
138 "//media/base/android:media_java", | 124 "//media/base/android:media_java", |
125 "//media/base/android:media_java", | |
126 "//media/midi:midi_java", | |
127 "//net/android:net_java", | |
139 "//printing:printing_java", | 128 "//printing:printing_java", |
140 "//sync/android:sync_java", | 129 "//third_party/WebKit/public:blink_headers_java", |
141 "//third_party/android_data_chart:android_data_chart_java", | 130 "//third_party/android_data_chart:android_data_chart_java", |
142 "//third_party/android_media:android_media_java", | 131 "//third_party/android_media:android_media_java", |
143 "//third_party/android_protobuf:protobuf_nano_javalib", | 132 "//third_party/android_protobuf:protobuf_nano_javalib", |
144 "//third_party/android_swipe_refresh:android_swipe_refresh_java", | 133 "//third_party/android_swipe_refresh:android_swipe_refresh_java", |
145 "//third_party/android_tools:android_gcm_java", | 134 "//third_party/android_tools:android_gcm_java", |
146 "//third_party/android_tools:android_support_v13_java", | 135 "//third_party/android_tools:android_support_v13_java", |
147 "//third_party/android_tools:android_support_v7_appcompat_java", | 136 "//third_party/android_tools:android_support_v7_appcompat_java", |
148 "//third_party/android_tools:android_support_v7_mediarouter_java", | 137 "//third_party/android_tools:android_support_v7_mediarouter_java", |
149 "//third_party/android_tools:android_support_v7_mediarouter_resources", | 138 "//third_party/android_tools:android_support_v7_mediarouter_resources", |
150 "//third_party/android_tools:android_support_v7_recyclerview_java", | 139 "//third_party/android_tools:android_support_v7_recyclerview_java", |
151 "//third_party/cacheinvalidation:cacheinvalidation_javalib", | 140 "//third_party/cacheinvalidation:cacheinvalidation_javalib", |
152 "//third_party/cacheinvalidation:cacheinvalidation_proto_java", | 141 "//third_party/cacheinvalidation:cacheinvalidation_proto_java", |
153 "//third_party/gif_player:gif_player_java", | 142 "//third_party/gif_player:gif_player_java", |
154 "//third_party/jsr-305:jsr_305_javalib", | 143 "//third_party/jsr-305:jsr_305_javalib", |
155 "//third_party/WebKit/public:blink_headers_java", | |
156 "//media/base/android:media_java", | |
157 "//media/midi:midi_java", | |
158 "//ui/android:ui_java", | 144 "//ui/android:ui_java", |
159 "//ui/android:ui_java_resources", | 145 "//ui/android:ui_java_resources", |
160 google_play_services_library, | 146 google_play_services_library, |
161 ] | 147 ] |
162 | 148 |
163 srcjar_deps = [ | 149 srcjar_deps = [ |
164 ":chrome_android_java_enums_srcjar", | 150 ":chrome_android_java_enums_srcjar", |
165 ":chrome_android_java_google_api_keys_srcjar", | 151 ":chrome_android_java_google_api_keys_srcjar", |
166 ":chrome_version_srcjar", | 152 ":chrome_version_srcjar", |
167 ":custom_tabs_service_aidl", | |
168 ":resource_id_javagen", | 153 ":resource_id_javagen", |
169 "//chrome:page_info_connection_type_javagen", | |
170 "//chrome:content_setting_javagen", | 154 "//chrome:content_setting_javagen", |
171 "//chrome:content_settings_type_javagen", | 155 "//chrome:content_settings_type_javagen", |
172 "//components/enhanced_bookmarks:enhanced_bookmarks_java_enums_srcjar", | |
173 "//components/offline_pages:offline_pages_enums_java", | |
174 "//components/omnibox/browser:autocomplete_match_type_javagen", | |
175 ] | 156 ] |
176 | 157 |
177 DEPRECATED_java_in_dir = "java/src" | 158 if (android_java_ui) { |
159 DEPRECATED_java_in_dir = "java/src" | |
160 | |
161 srcjar_deps += [ | |
162 ":custom_tabs_service_aidl", | |
163 "//chrome:page_info_connection_type_javagen", | |
164 "//components/enhanced_bookmarks:enhanced_bookmarks_java_enums_srcjar", | |
165 "//components/offline_pages:offline_pages_enums_java", | |
166 "//components/omnibox/browser:autocomplete_match_type_javagen", | |
167 ] | |
168 | |
169 deps += [ | |
170 ":chrome_java_resources", | |
171 ":document_tab_model_info_proto_java", | |
172 "//components/bookmarks/common/android:bookmarks_java", | |
173 "//components/dom_distiller/android:dom_distiller_content_java", | |
174 "//components/dom_distiller/android:dom_distiller_core_java", | |
175 "//components/gcm_driver/android:gcm_driver_java", | |
176 "//components/invalidation/impl:java", | |
177 "//components/navigation_interception/android:navigation_interception_java ", | |
178 "//components/policy/android:policy_java", | |
179 "//components/precache/android:precache_java", | |
180 "//components/service_tab_launcher:service_tab_launcher_java", | |
181 "//components/signin/core/browser/android:java", | |
182 "//components/web_contents_delegate_android:web_contents_delegate_android_ java", | |
183 "//sync/android:sync_java", | |
184 ] | |
185 } | |
178 } | 186 } |
179 | 187 |
180 # GYP: //chrome/chrome_browser.gypi:activity_type_ids_java | 188 # GYP: //chrome/chrome_browser.gypi:activity_type_ids_java |
181 # GYP: //chrome/chrome_browser.gypi:connectivity_check_result_java | 189 # GYP: //chrome/chrome_browser.gypi:connectivity_check_result_java |
182 # GYP: //chrome/chrome_browser.gypi:shortcut_source_java | 190 # GYP: //chrome/chrome_browser.gypi:shortcut_source_java |
183 # GYP: //chrome/chrome_browser.gypi:profile_account_management_metrics_java | 191 # GYP: //chrome/chrome_browser.gypi:profile_account_management_metrics_java |
184 # GYP: //chrome/chrome_browser.gypi:connection_security_levels_java | 192 # GYP: //chrome/chrome_browser.gypi:connection_security_levels_java |
185 # GYP: //chrome/chrome_browser.gypi:tab_load_status_java | 193 # GYP: //chrome/chrome_browser.gypi:tab_load_status_java |
186 # GYP: //chrome/chrome_browser.gypi:infobar_action_type_java | 194 # GYP: //chrome/chrome_browser.gypi:infobar_action_type_java |
187 | 195 |
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
250 "junit/src/org/chromium/chrome/browser/webapps/WebappRegistryTest.java", | 258 "junit/src/org/chromium/chrome/browser/webapps/WebappRegistryTest.java", |
251 ] | 259 ] |
252 deps = [ | 260 deps = [ |
253 ":chrome_java", | 261 ":chrome_java", |
254 "//base:base_java", | 262 "//base:base_java", |
255 "//base:base_java_test_support", | 263 "//base:base_java_test_support", |
256 "//base:base_junit_test_support", | 264 "//base:base_junit_test_support", |
257 "//components/invalidation/impl:java", | 265 "//components/invalidation/impl:java", |
258 "//sync:sync_java_test_support", | 266 "//sync:sync_java_test_support", |
259 "//sync/android:sync_java", | 267 "//sync/android:sync_java", |
268 "//third_party/android_tools:android_support_v7_mediarouter_java", | |
260 "//third_party/cacheinvalidation:cacheinvalidation_javalib", | 269 "//third_party/cacheinvalidation:cacheinvalidation_javalib", |
261 "//third_party/junit:hamcrest", | 270 "//third_party/junit:hamcrest", |
262 "//third_party/android_tools:android_support_v7_mediarouter_java", | |
263 google_play_services_library, | 271 google_play_services_library, |
264 ] | 272 ] |
265 } | 273 } |
266 | 274 |
267 # GYP: //chrome/chrome_android.gypi:chrome_version_java | 275 # GYP: //chrome/chrome_android.gypi:chrome_version_java |
268 chrome_version_java_dir = "$root_gen_dir/templates/chrome_version_java" | 276 chrome_version_java_dir = "$root_gen_dir/templates/chrome_version_java" |
269 chrome_version_java_file = "$chrome_version_java_dir/org/chromium/chrome/browser /ChromeVersionConstants.java" | 277 chrome_version_java_file = "$chrome_version_java_dir/org/chromium/chrome/browser /ChromeVersionConstants.java" |
270 process_version("chrome_version_java") { | 278 process_version("chrome_version_java") { |
271 template_file = "java/ChromeVersionConstants.java.version" | 279 template_file = "java/ChromeVersionConstants.java.version" |
272 output = chrome_version_java_file | 280 output = chrome_version_java_file |
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
315 "//components/navigation_interception/android:navigation_interception_java", | 323 "//components/navigation_interception/android:navigation_interception_java", |
316 "//components/policy/android:policy_java", | 324 "//components/policy/android:policy_java", |
317 "//components/precache/android:precache_java", | 325 "//components/precache/android:precache_java", |
318 "//components/precache/android:precache_javatests", | 326 "//components/precache/android:precache_javatests", |
319 "//components/web_contents_delegate_android:web_contents_delegate_android_ja va", | 327 "//components/web_contents_delegate_android:web_contents_delegate_android_ja va", |
320 "//content/public/android:content_java", | 328 "//content/public/android:content_java", |
321 "//content/public/test/android:content_java_test_support", | 329 "//content/public/test/android:content_java_test_support", |
322 "//net/android:net_java", | 330 "//net/android:net_java", |
323 "//net/android:net_java_test_support", | 331 "//net/android:net_java_test_support", |
324 "//printing:printing_java", | 332 "//printing:printing_java", |
333 "//sync:sync_java_test_support", | |
325 "//sync/android:sync_java", | 334 "//sync/android:sync_java", |
326 "//sync/android:sync_javatests", | 335 "//sync/android:sync_javatests", |
327 "//sync:sync_java_test_support", | 336 "//third_party/android_tools:android_support_v13_java", |
328 "//third_party/android_tools:android_support_v7_appcompat_java", | 337 "//third_party/android_tools:android_support_v7_appcompat_java", |
329 "//third_party/android_tools:android_support_v7_recyclerview_java", | 338 "//third_party/android_tools:android_support_v7_recyclerview_java", |
330 "//third_party/android_tools:android_support_v13_java", | |
331 "//third_party/android_tools:legacy_http_javalib", | 339 "//third_party/android_tools:legacy_http_javalib", |
332 "//third_party/cacheinvalidation:cacheinvalidation_javalib", | 340 "//third_party/cacheinvalidation:cacheinvalidation_javalib", |
333 "//third_party/jsr-305:jsr_305_javalib", | 341 "//third_party/jsr-305:jsr_305_javalib", |
334 "//ui/android:ui_java", | 342 "//ui/android:ui_java", |
335 "//ui/android:ui_javatests", | 343 "//ui/android:ui_javatests", |
336 google_play_services_library, | 344 google_play_services_library, |
337 ] | 345 ] |
338 } | 346 } |
339 | 347 |
340 # Overrides icon / name defined in chrome_java_resources. | 348 # Overrides icon / name defined in chrome_java_resources. |
(...skipping 101 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
442 apk_name = "ChromePublicTest" | 450 apk_name = "ChromePublicTest" |
443 apk_under_test = ":chrome_public_apk" | 451 apk_under_test = ":chrome_public_apk" |
444 android_manifest = chrome_public_test_apk_manifest | 452 android_manifest = chrome_public_test_apk_manifest |
445 deps = [ | 453 deps = [ |
446 ":chrome_public_test_apk_manifest", | 454 ":chrome_public_test_apk_manifest", |
447 "//chrome/android:chrome_shared_test_java", | 455 "//chrome/android:chrome_shared_test_java", |
448 ] | 456 ] |
449 isolate_file = "../chrome_public_test_apk.isolate" | 457 isolate_file = "../chrome_public_test_apk.isolate" |
450 proguard_enabled = !is_debug | 458 proguard_enabled = !is_debug |
451 } | 459 } |
OLD | NEW |