| 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 162 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 173 | 173 |
| 174 # TODO(sievers): Split java code into components. Not everything | 174 # TODO(sievers): Split java code into components. Not everything |
| 175 # is really all that UI related here. | 175 # is really all that UI related here. |
| 176 if (android_java_ui) { | 176 if (android_java_ui) { |
| 177 # From java_sources.gni. | 177 # From java_sources.gni. |
| 178 java_files = chrome_java_sources | 178 java_files = chrome_java_sources |
| 179 | 179 |
| 180 srcjar_deps += [ | 180 srcjar_deps += [ |
| 181 "//chrome:page_info_connection_type_javagen", | 181 "//chrome:page_info_connection_type_javagen", |
| 182 "//chrome:website_settings_action_javagen", | 182 "//chrome:website_settings_action_javagen", |
| 183 "//components/browsing_data:browsing_data_utils_java", |
| 183 "//components/infobars/core:infobar_enums_java", | 184 "//components/infobars/core:infobar_enums_java", |
| 184 "//components/ntp_snippets:ntp_snippets_java_enums_srcjar", | 185 "//components/ntp_snippets:ntp_snippets_java_enums_srcjar", |
| 185 "//components/ntp_tiles:ntp_tiles_enums_java", | 186 "//components/ntp_tiles:ntp_tiles_enums_java", |
| 186 "//components/offline_pages:offline_page_model_enums_java", | 187 "//components/offline_pages:offline_page_model_enums_java", |
| 187 "//components/omnibox/browser:autocomplete_match_javagen", | 188 "//components/omnibox/browser:autocomplete_match_javagen", |
| 188 "//components/omnibox/browser:autocomplete_match_type_javagen", | 189 "//components/omnibox/browser:autocomplete_match_type_javagen", |
| 189 "//components/security_state:security_state_enums_java", | 190 "//components/security_state:security_state_enums_java", |
| 190 "//components/signin/core/browser:investigated_scenario_java", | 191 "//components/signin/core/browser:investigated_scenario_java", |
| 191 ] | 192 ] |
| 192 | 193 |
| (...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 231 ] | 232 ] |
| 232 } | 233 } |
| 233 | 234 |
| 234 java_cpp_enum("chrome_android_java_enums_srcjar") { | 235 java_cpp_enum("chrome_android_java_enums_srcjar") { |
| 235 sources = [ | 236 sources = [ |
| 236 "//chrome/browser/android/activity_type_ids.h", | 237 "//chrome/browser/android/activity_type_ids.h", |
| 237 "//chrome/browser/android/feedback/connectivity_checker.cc", | 238 "//chrome/browser/android/feedback/connectivity_checker.cc", |
| 238 "//chrome/browser/android/policy/policy_auditor.cc", | 239 "//chrome/browser/android/policy/policy_auditor.cc", |
| 239 "//chrome/browser/android/shortcut_info.h", | 240 "//chrome/browser/android/shortcut_info.h", |
| 240 "//chrome/browser/android/tab_android.h", | 241 "//chrome/browser/android/tab_android.h", |
| 241 "//chrome/browser/browsing_data/browsing_data_counter_utils.h", | |
| 242 "//chrome/browser/browsing_data/browsing_data_remover.h", | |
| 243 "//chrome/browser/profiles/profile_metrics.h", | 242 "//chrome/browser/profiles/profile_metrics.h", |
| 244 "//chrome/browser/ui/android/infobars/infobar_android.h", | 243 "//chrome/browser/ui/android/infobars/infobar_android.h", |
| 245 ] | 244 ] |
| 246 } | 245 } |
| 247 | 246 |
| 248 # GYP: //chrome/chrome_browser.gypi:document_tab_model_info_proto_java | 247 # GYP: //chrome/chrome_browser.gypi:document_tab_model_info_proto_java |
| 249 proto_java_library("document_tab_model_info_proto_java") { | 248 proto_java_library("document_tab_model_info_proto_java") { |
| 250 proto_path = "java/src/org/chromium/chrome/browser/tabmodel/document" | 249 proto_path = "java/src/org/chromium/chrome/browser/tabmodel/document" |
| 251 sources = [ | 250 sources = [ |
| 252 "$proto_path/document_tab_model_info.proto", | 251 "$proto_path/document_tab_model_info.proto", |
| (...skipping 339 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 592 instrumentation_test_apk("chrome_sync_shell_test_apk") { | 591 instrumentation_test_apk("chrome_sync_shell_test_apk") { |
| 593 apk_name = "ChromeSyncShellTest" | 592 apk_name = "ChromeSyncShellTest" |
| 594 apk_under_test = ":chrome_sync_shell_apk" | 593 apk_under_test = ":chrome_sync_shell_apk" |
| 595 android_manifest = chrome_sync_shell_test_apk_manifest | 594 android_manifest = chrome_sync_shell_test_apk_manifest |
| 596 android_manifest_dep = ":chrome_sync_shell_test_apk_manifest" | 595 android_manifest_dep = ":chrome_sync_shell_test_apk_manifest" |
| 597 deps = [ | 596 deps = [ |
| 598 ":chrome_sync_shell_test_apk_java", | 597 ":chrome_sync_shell_test_apk_java", |
| 599 ] | 598 ] |
| 600 proguard_enabled = !is_java_debug | 599 proguard_enabled = !is_java_debug |
| 601 } | 600 } |
| OLD | NEW |