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/common/features.gni") | 9 import("//chrome/common/features.gni") |
10 import("//chrome/version.gni") | 10 import("//chrome/version.gni") |
(...skipping 148 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
159 "//ui/android:ui_java_resources", | 159 "//ui/android:ui_java_resources", |
160 google_play_services_library, | 160 google_play_services_library, |
161 ] | 161 ] |
162 | 162 |
163 srcjar_deps = [ | 163 srcjar_deps = [ |
164 ":chrome_android_java_enums_srcjar", | 164 ":chrome_android_java_enums_srcjar", |
165 ":chrome_android_java_google_api_keys_srcjar", | 165 ":chrome_android_java_google_api_keys_srcjar", |
166 ":chrome_version_srcjar", | 166 ":chrome_version_srcjar", |
167 ":resource_id_javagen", | 167 ":resource_id_javagen", |
168 "//chrome:content_setting_javagen", | 168 "//chrome:content_setting_javagen", |
| 169 "//chrome:content_settings_type_javagen", |
169 "//chrome:data_use_ui_message_enum_javagen", | 170 "//chrome:data_use_ui_message_enum_javagen", |
170 "//chrome:signin_metrics_enum_javagen", | 171 "//chrome:signin_metrics_enum_javagen", |
171 ] | 172 ] |
172 | 173 |
173 # TODO(sievers): Split java code into components. Not everything | 174 # TODO(sievers): Split java code into components. Not everything |
174 # is really all that UI related here. | 175 # is really all that UI related here. |
175 if (android_java_ui) { | 176 if (android_java_ui) { |
176 DEPRECATED_java_in_dir = "java/src" | 177 DEPRECATED_java_in_dir = "java/src" |
177 | 178 |
178 srcjar_deps += [ | 179 srcjar_deps += [ |
(...skipping 400 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
579 apk_name = "ChromeSyncShellTest" | 580 apk_name = "ChromeSyncShellTest" |
580 apk_under_test = ":chrome_sync_shell_apk" | 581 apk_under_test = ":chrome_sync_shell_apk" |
581 android_manifest = chrome_sync_shell_test_apk_manifest | 582 android_manifest = chrome_sync_shell_test_apk_manifest |
582 deps = [ | 583 deps = [ |
583 ":chrome_sync_shell_test_apk_java", | 584 ":chrome_sync_shell_test_apk_java", |
584 ":chrome_sync_shell_test_apk_manifest", | 585 ":chrome_sync_shell_test_apk_manifest", |
585 ] | 586 ] |
586 isolate_file = "../chrome_sync_shell_test_apk.isolate" | 587 isolate_file = "../chrome_sync_shell_test_apk.isolate" |
587 proguard_enabled = !is_debug | 588 proguard_enabled = !is_debug |
588 } | 589 } |
OLD | NEW |