Android build for ungoogled-chromium. https://uc.droidware.info
You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
 

1249 lines
48 KiB

---
apps/BUILD.gn | 2
build/config/locales.gni | 2
chrome/BUILD.gn | 4
chrome/android/BUILD.gn | 1
chrome/browser/BUILD.gn | 43 +---
chrome/browser/apps/platform_apps/api/music_manager_private/BUILD.gn | 1
chrome/browser/devtools/BUILD.gn | 14 -
chrome/browser/extensions/BUILD.gn | 7
chrome/browser/media/router/discovery/BUILD.gn | 4
chrome/browser/resources/BUILD.gn | 4
chrome/browser/ui/BUILD.gn | 88 +---------
chrome/browser/ui/views/BUILD.gn | 2
chrome/browser/ui/webui/discards/BUILD.gn | 2
chrome/browser/web_applications/BUILD.gn | 3
chrome/browser/web_applications/components/BUILD.gn | 11 -
chrome/browser/web_applications/extensions/BUILD.gn | 1
chrome/chrome_paks.gni | 2
chrome/common/BUILD.gn | 1
chrome/common/extensions/api/api_sources.gni | 2
chrome/renderer/BUILD.gn | 2
chrome/test/BUILD.gn | 1
components/bookmarks/browser/BUILD.gn | 2
components/guest_view/browser/BUILD.gn | 2
components/guest_view/renderer/BUILD.gn | 2
components/keep_alive_registry/BUILD.gn | 2
components/web_modal/BUILD.gn | 2
components/zoom/BUILD.gn | 2
content/browser/BUILD.gn | 2
content/browser/devtools/BUILD.gn | 2
content/public/browser/BUILD.gn | 2
extensions/BUILD.gn | 1
extensions/browser/api/system_cpu/BUILD.gn | 1
extensions/buildflags/buildflags.gni | 2
services/device/public/cpp/hid/BUILD.gn | 1
third_party/blink/public/mojom/BUILD.gn | 2
ui/base/BUILD.gn | 19 --
ui/gfx/BUILD.gn | 2
ui/gfx/animation/BUILD.gn | 2
ui/message_center/BUILD.gn | 4
ui/views/BUILD.gn | 20 ++
40 files changed, 95 insertions(+), 174 deletions(-)
--- a/apps/BUILD.gn
+++ b/apps/BUILD.gn
@@ -6,7 +6,7 @@ import("//build/config/features.gni")
import("//build/config/ui.gni")
import("//extensions/buildflags/buildflags.gni")
-assert(!is_android && !is_ios)
+# assert(!is_android && !is_ios)
assert(enable_extensions,
"Cannot depend on extensions because enable_extensions=false.")
--- a/chrome/browser/media/router/discovery/BUILD.gn
+++ b/chrome/browser/media/router/discovery/BUILD.gn
@@ -2,8 +2,6 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
-assert(!is_android)
-
static_library("discovery") {
inputs = [ "$root_gen_dir/chrome/grit/generated_resources.h" ]
deps = [
@@ -75,7 +73,7 @@ static_library("discovery") {
sources += [ "discovery_network_list_wifi_linux.cc" ]
}
- if (is_posix) {
+ if (is_posix && !is_android) {
sources += [ "discovery_network_list_posix.cc" ]
}
--- a/ui/base/BUILD.gn
+++ b/ui/base/BUILD.gn
@@ -452,6 +452,11 @@ jumbo_component("base") {
deps += [ "//third_party/re2" ]
}
+ sources += [
+ "dragdrop/os_exchange_data_provider_android.cc",
+ "dragdrop/os_exchange_data_provider_android.h",
+ ]
+
if (!is_ios) {
# iOS does not use Chromium-specific code for event handling.
public_deps += [
@@ -613,14 +618,6 @@ jumbo_component("base") {
if (!toolkit_views && !use_aura) {
sources -= [
"dragdrop/drag_drop_types.h",
- "dragdrop/drop_target_event.cc",
- "dragdrop/drop_target_event.h",
- "dragdrop/os_exchange_data.cc",
- "dragdrop/os_exchange_data.h",
- "dragdrop/os_exchange_data_provider_factory.cc",
- "dragdrop/os_exchange_data_provider_factory.h",
- "nine_image_painter_factory.cc",
- "nine_image_painter_factory.h",
]
}
@@ -629,12 +626,6 @@ jumbo_component("base") {
libs += [ "jnigraphics" ]
sources -= [
- "default_theme_provider.cc",
- "l10n/l10n_font_util.cc",
- "models/button_menu_item_model.cc",
- "pointer/touch_editing_controller.cc",
- "theme_provider.cc",
- "ui_base_types.cc",
]
}
--- a/chrome/browser/web_applications/BUILD.gn
+++ b/chrome/browser/web_applications/BUILD.gn
@@ -198,7 +198,6 @@ source_set("web_applications_unit_tests"
"//chrome/browser",
"//chrome/browser/web_applications/components",
"//chrome/common",
- "//chrome/test:test_support",
"//content/public/browser",
"//content/test:test_support",
"//skia",
@@ -244,8 +243,6 @@ source_set("web_applications_browser_tes
"//chrome/app:command_ids",
"//chrome/browser/web_applications/components",
"//chrome/services/app_service/public/cpp:app_update",
- "//chrome/test:test_support",
- "//chrome/test:test_support_ui",
"//components/permissions:permissions",
]
--- a/chrome/browser/web_applications/components/BUILD.gn
+++ b/chrome/browser/web_applications/components/BUILD.gn
@@ -97,6 +97,14 @@ source_set("components") {
]
}
+ if (is_android) {
+ sources += [
+ "web_app_shortcut_android.h",
+ "web_app_shortcut_android.cc",
+ ]
+ }
+
+
if (is_win) {
sources += [
"web_app_file_handler_registration_win.cc",
@@ -181,7 +189,6 @@ source_set("unit_tests") {
"//chrome/app/theme:theme_resources",
"//chrome/browser/web_applications:web_app_test_group",
"//chrome/browser/web_applications:web_applications_test_support",
- "//chrome/test:test_support",
"//content/public/browser",
"//skia",
"//testing/gmock",
@@ -211,8 +218,6 @@ source_set("browser_tests") {
deps = [
":components",
"//chrome/browser/web_applications:web_applications_test_support",
- "//chrome/test:test_support",
- "//chrome/test:test_support_ui",
"//net:test_support",
]
}
--- a/chrome/browser/web_applications/extensions/BUILD.gn
+++ b/chrome/browser/web_applications/extensions/BUILD.gn
@@ -67,7 +67,6 @@ source_set("unit_tests") {
"//chrome/browser/web_applications:web_applications_test_support",
"//chrome/browser/web_applications/components",
"//chrome/common",
- "//chrome/test:test_support",
"//components/crx_file:crx_file",
"//content/public/browser",
"//content/test:test_support",
--- a/chrome/browser/ui/views/BUILD.gn
+++ b/chrome/browser/ui/views/BUILD.gn
@@ -5,8 +5,6 @@
import("//build/config/ui.gni")
import("//ui/views/features.gni")
-assert(toolkit_views)
-
component("views") {
output_name = "browser_ui_views"
sources = [
--- a/components/guest_view/browser/BUILD.gn
+++ b/components/guest_view/browser/BUILD.gn
@@ -6,7 +6,7 @@
# assert to prevent the accidental building of GuestViews on mobile
# platforms. If you're now using GuestViews on mobile, go ahead and
# remove this assert.
-assert(!is_android && !is_ios)
+# assert(!is_android && !is_ios)
static_library("browser") {
output_name = "guest_view_browser"
--- a/components/guest_view/renderer/BUILD.gn
+++ b/components/guest_view/renderer/BUILD.gn
@@ -6,7 +6,7 @@
# assert to prevent the accidental building of GuestViews on mobile
# platforms. If you're now using GuestViews on mobile, go ahead and
# remove this assert.
-assert(!is_android && !is_ios)
+# assert(!is_android && !is_ios)
static_library("renderer") {
sources = [
--- a/components/keep_alive_registry/BUILD.gn
+++ b/components/keep_alive_registry/BUILD.gn
@@ -2,7 +2,7 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
-assert(!is_android)
+# assert(!is_android)
source_set("keep_alive_registry") {
sources = [
--- a/components/web_modal/BUILD.gn
+++ b/components/web_modal/BUILD.gn
@@ -2,7 +2,7 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
-assert(!is_android && !is_ios)
+# assert(!is_android && !is_ios)
component("web_modal") {
sources = [
--- a/components/zoom/BUILD.gn
+++ b/components/zoom/BUILD.gn
@@ -2,7 +2,7 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
-assert(!is_android && !is_ios, "Desktop zoom is not used on mobile platforms.")
+# assert(!is_android && !is_ios, "Desktop zoom is not used on mobile platforms.")
static_library("zoom") {
sources = [
--- a/extensions/buildflags/buildflags.gni
+++ b/extensions/buildflags/buildflags.gni
@@ -5,7 +5,7 @@
import("//build/config/features.gni")
declare_args() {
- enable_extensions = !is_android && !is_ios && !is_fuchsia
+ enable_extensions = !is_ios && !is_fuchsia
# Enables Wi-Fi Display functionality
# WARNING: This enables MPEG Transport Stream (MPEG-TS) encoding!
--- a/services/device/public/cpp/hid/BUILD.gn
+++ b/services/device/public/cpp/hid/BUILD.gn
@@ -7,7 +7,6 @@ import("//build/config/features.gni")
source_set("hid") {
# HID is not implemented on Android and we want to be particularly careful
# about not bloating binary size by accidentially including it.
- assert(!is_android)
sources = [
"fake_input_service_linux.cc",
--- a/ui/views/BUILD.gn
+++ b/ui/views/BUILD.gn
@@ -12,7 +12,7 @@ import("//ui/base/ui_features.gni")
import("//ui/ozone/ozone.gni")
import("//ui/views/features.gni")
-assert(toolkit_views)
+# assert(toolkit_views)
# Reset sources_assignment_filter for the BUILD.gn file to prevent
# regression during the migration of Chromium away from the feature.
@@ -153,6 +153,7 @@ jumbo_component("views") {
"controls/menu/menu_types.h",
"controls/menu/submenu_view.h",
"controls/message_box_view.h",
+ "controls/native/native_view_host_android.h",
"controls/native/native_view_host.h",
"controls/native/native_view_host_mac.h",
"controls/native/native_view_host_wrapper.h",
@@ -189,6 +190,7 @@ jumbo_component("views") {
"debug_utils.h",
"drag_controller.h",
"drag_utils.h",
+ "event_monitor_android.h",
"event_monitor.h",
"focus/external_focus_tracker.h",
"focus/focus_manager.h",
@@ -255,6 +257,7 @@ jumbo_component("views") {
"widget/native_widget_private.h",
"widget/root_view.h",
"widget/root_view_targeter.h",
+ "widget/tooltip_manager_android.h",
"widget/tooltip_manager.h",
"widget/widget.h",
"widget/widget_delegate.h",
@@ -343,6 +346,7 @@ jumbo_component("views") {
"controls/label.cc",
"controls/link.cc",
"controls/menu/menu_config.cc",
+ "controls/menu/menu_config_android.cc",
"controls/menu/menu_controller.cc",
"controls/menu/menu_delegate.cc",
"controls/menu/menu_host.cc",
@@ -350,6 +354,8 @@ jumbo_component("views") {
"controls/menu/menu_image_util.cc",
"controls/menu/menu_item_view.cc",
"controls/menu/menu_model_adapter.cc",
+ "controls/menu/menu_pre_target_handler_android.cc",
+ "controls/menu/menu_pre_target_handler_android.h",
"controls/menu/menu_runner.cc",
"controls/menu/menu_runner_impl.cc",
"controls/menu/menu_runner_impl_adapter.cc",
@@ -357,6 +363,7 @@ jumbo_component("views") {
"controls/menu/menu_separator.cc",
"controls/menu/submenu_view.cc",
"controls/message_box_view.cc",
+ "controls/native/native_view_host_android.cc",
"controls/native/native_view_host.cc",
"controls/prefix_selector.cc",
"controls/progress_bar.cc",
@@ -385,7 +392,9 @@ jumbo_component("views") {
"controls/views_text_services_context_menu_base.cc",
"controls/views_text_services_context_menu_base.h",
"debug_utils.cc",
+ "drag_utils_android.cc",
"drag_utils.cc",
+ "event_monitor_android.cc",
"focus/external_focus_tracker.cc",
"focus/focus_manager.cc",
"focus/focus_manager_factory.cc",
@@ -408,9 +417,12 @@ jumbo_component("views") {
"metadata/metadata_cache.cc",
"metadata/metadata_types.cc",
"metadata/type_conversion.cc",
+ "metrics_android.cc",
"metrics.cc",
"mouse_watcher.cc",
"mouse_watcher_view_host.cc",
+ "native_cursor_android.cc",
+ "native_cursor_android.h",
"paint_info.cc",
"painter.cc",
"rect_based_targeting_utils.cc",
@@ -420,6 +432,7 @@ jumbo_component("views") {
"style/platform_style.cc",
"style/typography.cc",
"style/typography_provider.cc",
+ "touchui/touch_selection_controller_impl.cc",
"view.cc",
"view_class_properties.cc",
"view_constants.cc",
@@ -431,12 +444,16 @@ jumbo_component("views") {
"views_delegate.cc",
"views_features.cc",
"views_switches.cc",
+ "views_touch_selection_controller_factory_android.cc",
"widget/any_widget_observer.cc",
"widget/any_widget_observer_singleton.cc",
"widget/drop_helper.cc",
+ "widget/native_widget_android.cc",
+ "widget/native_widget_android.h",
"widget/native_widget_private.cc",
"widget/root_view.cc",
"widget/root_view_targeter.cc",
+ "widget/tooltip_manager_android.cc",
"widget/tooltip_manager.cc",
"widget/widget.cc",
"widget/widget_aura_utils.cc",
@@ -484,6 +501,7 @@ jumbo_component("views") {
"//skia",
"//third_party/icu",
"//ui/accessibility",
+ "//ui/android",
"//ui/base/clipboard",
"//ui/display",
"//ui/latency",
--- a/chrome/test/BUILD.gn
+++ b/chrome/test/BUILD.gn
@@ -4837,7 +4837,6 @@ test("unit_tests") {
"//chrome/common/extensions/api",
"//components/safe_browsing:buildflags",
"//components/services/unzip:in_process",
- "//extensions:extensions_resources",
"//extensions/browser:test_support",
"//extensions/common",
"//extensions/renderer:unit_test_support",
--- a/extensions/BUILD.gn
+++ b/extensions/BUILD.gn
@@ -220,7 +220,6 @@ test("extensions_unittests") {
]
deps = [
- ":extensions_resources",
":shell_and_test_pak",
":test_support",
"//base/test:test_support",
--- a/chrome/BUILD.gn
+++ b/chrome/BUILD.gn
@@ -1393,7 +1393,7 @@ group("extra_resources") {
"//components/autofill/core/browser:autofill_address_rewriter_resources",
]
- if (!is_android) {
+ if (enable_extensions || !is_android) {
public_deps += [
"//chrome/browser/resources:bookmarks_resources",
"//chrome/browser/resources:component_extension_resources",
@@ -1417,7 +1417,7 @@ group("extra_resources") {
]
}
- if (!is_android && !is_chromeos) {
+ if (is_android && !is_chromeos) {
public_deps += [ "//chrome/browser/resources:welcome_resources" ]
}
--- a/chrome/browser/resources/BUILD.gn
+++ b/chrome/browser/resources/BUILD.gn
@@ -85,7 +85,7 @@ if (closure_compile) {
}
}
-if (!is_android) {
+if (enable_extensions || !is_android) {
grit("bookmarks_resources") {
grit_flags = [
"-E",
@@ -303,7 +303,7 @@ if (is_chromeos) {
}
}
-if (!is_android && !is_chromeos) {
+if (is_android && !is_chromeos) {
grit("welcome_resources") {
source = "welcome/welcome_resources.grd"
--- a/third_party/blink/public/mojom/BUILD.gn
+++ b/third_party/blink/public/mojom/BUILD.gn
@@ -180,7 +180,7 @@ mojom("mojom_platform") {
"worker/worker_options.mojom",
]
- if (!is_android) {
+ if (is_android) {
sources += [ "serial/serial.mojom" ]
}
--- a/chrome/browser/BUILD.gn
+++ b/chrome/browser/BUILD.gn
@@ -414,7 +414,6 @@ jumbo_static_library("browser") {
"download/download_core_service_factory.h",
"download/download_core_service_impl.cc",
"download/download_core_service_impl.h",
- "download/download_crx_util_android.cc",
"download/download_file_picker.cc",
"download/download_file_picker.h",
"download/download_history.cc",
@@ -458,6 +457,7 @@ jumbo_static_library("browser") {
"download/download_ui_controller.h",
"download/download_ui_model.cc",
"download/download_ui_model.h",
+ "download/drag_download_item_android.cc",
"download/drag_download_item.h",
"download/mixed_content_download_blocking.cc",
"download/mixed_content_download_blocking.h",
@@ -1224,6 +1224,8 @@ jumbo_static_library("browser") {
"plugins/pdf_plugin_placeholder_observer.h",
"policy/browser_dm_token_storage.cc",
"policy/browser_dm_token_storage.h",
+ "policy/browser_dm_token_storage_android.cc",
+ "policy/browser_dm_token_storage_android.h",
"policy/browser_dm_token_storage_linux.cc",
"policy/browser_dm_token_storage_linux.h",
"policy/browser_dm_token_storage_mac.h",
@@ -3090,7 +3092,6 @@ jumbo_static_library("browser") {
defines += [ "ENABLE_PASSWORD_CHANGE" ]
}
- } else { # !is_android
sources += [
"accessibility/invert_bubble_prefs.cc",
"accessibility/invert_bubble_prefs.h",
@@ -3142,8 +3143,6 @@ jumbo_static_library("browser") {
"badging/badge_manager_delegate.h",
"badging/badge_manager_factory.cc",
"badging/badge_manager_factory.h",
- "banners/app_banner_manager_desktop.cc",
- "banners/app_banner_manager_desktop.h",
"bookmarks/bookmark_html_writer.cc",
"bookmarks/bookmark_html_writer.h",
"certificate_viewer.h",
@@ -3356,7 +3355,6 @@ jumbo_static_library("browser") {
"metrics/desktop_session_duration/desktop_session_duration_tracker.h",
"metrics/first_web_contents_profiler.cc",
"metrics/first_web_contents_profiler.h",
- "metrics/incognito_observer_desktop.cc",
"metrics/tab_stats_data_store.cc",
"metrics/tab_stats_data_store.h",
"metrics/tab_stats_tracker.cc",
@@ -3369,6 +3367,7 @@ jumbo_static_library("browser") {
"notifications/profile_notification.cc",
"notifications/profile_notification.h",
"obsolete_system/obsolete_system.h",
+ "obsolete_system/obsolete_system_android.cc",
"obsolete_system/obsolete_system_linux.cc",
"obsolete_system/obsolete_system_mac.cc",
"obsolete_system/obsolete_system_win.cc",
@@ -3446,14 +3445,6 @@ jumbo_static_library("browser") {
"profiles/profile_window.h",
"renderer_context_menu/accessibility_labels_bubble_model.cc",
"renderer_context_menu/accessibility_labels_bubble_model.h",
- "renderer_context_menu/accessibility_labels_menu_observer.cc",
- "renderer_context_menu/accessibility_labels_menu_observer.h",
- "renderer_context_menu/render_view_context_menu.cc",
- "renderer_context_menu/render_view_context_menu.h",
- "renderer_context_menu/spelling_bubble_model.cc",
- "renderer_context_menu/spelling_bubble_model.h",
- "renderer_context_menu/spelling_menu_observer.cc",
- "renderer_context_menu/spelling_menu_observer.h",
"repost_form_warning_controller.cc",
"repost_form_warning_controller.h",
"resource_coordinator/background_tab_navigation_throttle.cc",
@@ -3593,16 +3584,6 @@ jumbo_static_library("browser") {
"serial/serial_chooser_context.h",
"serial/serial_chooser_context_factory.cc",
"serial/serial_chooser_context_factory.h",
- "sharing/click_to_call/click_to_call_context_menu_observer.cc",
- "sharing/click_to_call/click_to_call_context_menu_observer.h",
- "sharing/click_to_call/click_to_call_metrics.cc",
- "sharing/click_to_call/click_to_call_metrics.h",
- "sharing/click_to_call/click_to_call_ui_controller.cc",
- "sharing/click_to_call/click_to_call_ui_controller.h",
- "sharing/click_to_call/click_to_call_utils.cc",
- "sharing/click_to_call/click_to_call_utils.h",
- "sharing/click_to_call/phone_number_regex.cc",
- "sharing/click_to_call/phone_number_regex.h",
"sharing/shared_clipboard/remote_copy_message_handler.cc",
"sharing/shared_clipboard/remote_copy_message_handler.h",
"sharing/shared_clipboard/shared_clipboard_context_menu_observer.cc",
@@ -3756,6 +3737,7 @@ jumbo_static_library("browser") {
"upgrade_detector/build_state.cc",
"upgrade_detector/build_state.h",
"upgrade_detector/build_state_observer.h",
+ "upgrade_detector/get_installed_version_android.cc",
"upgrade_detector/upgrade_detector.cc",
"upgrade_detector/upgrade_detector.h",
"upgrade_detector/upgrade_observer.h",
@@ -3786,7 +3768,6 @@ jumbo_static_library("browser") {
"//chrome/browser/profile_resetter:profile_reset_report_proto",
"//chrome/browser/resource_coordinator:intervention_policy_database_proto",
"//chrome/browser/resource_coordinator:tab_metrics_event_proto",
- "//chrome/browser/resource_coordinator/tab_ranker",
"//chrome/browser/resources:component_extension_resources",
"//chrome/browser/search:generated",
"//chrome/common/importer:interfaces",
@@ -3816,7 +3797,6 @@ jumbo_static_library("browser") {
"chrome_browser_main_posix.h",
"first_run/first_run_internal_posix.cc",
"importer/firefox_profile_lock_posix.cc",
- "process_singleton_posix.cc",
"task_manager/sampling/shared_sampler_posix.cc",
]
}
@@ -3923,8 +3903,6 @@ jumbo_static_library("browser") {
"notifications/web_page_notifier_controller.h",
"policy/default_geolocation_policy_handler.cc",
"policy/default_geolocation_policy_handler.h",
- "renderer_context_menu/quick_answers_menu_observer.cc",
- "renderer_context_menu/quick_answers_menu_observer.h",
"signin/signin_error_notifier_ash.cc",
"signin/signin_error_notifier_ash.h",
"signin/signin_error_notifier_factory_ash.cc",
@@ -4334,7 +4312,7 @@ jumbo_static_library("browser") {
]
}
- if (!is_android && !is_chromeos) {
+ if (is_android && !is_chromeos) {
sources += [
"device_identity/device_oauth2_token_store_desktop.cc",
"device_identity/device_oauth2_token_store_desktop.h",
@@ -4364,8 +4342,6 @@ jumbo_static_library("browser") {
"policy/chrome_browser_cloud_management_register_watcher.h",
"policy/cloud/chrome_browser_cloud_management_helper.cc",
"policy/cloud/chrome_browser_cloud_management_helper.h",
- "policy/cloud/user_policy_signin_service.cc",
- "policy/cloud/user_policy_signin_service.h",
"policy/cloud/user_policy_signin_service_internal.h",
"profiles/avatar_menu.cc",
"profiles/avatar_menu.h",
@@ -4401,7 +4377,6 @@ jumbo_static_library("browser") {
"upgrade_detector/upgrade_detector_impl.cc",
"upgrade_detector/upgrade_detector_impl.h",
]
- } else {
sources += [
"media/protected_media_identifier_permission_context.cc",
"media/protected_media_identifier_permission_context.h",
@@ -4507,7 +4482,7 @@ jumbo_static_library("browser") {
sources -= [ "background/background_mode_manager_aura.cc" ]
}
}
- if (enable_background_contents) {
+ if (true) {
sources += [
"background/background_contents_service.cc",
"background/background_contents_service.h",
@@ -5274,7 +5249,7 @@ jumbo_static_library("browser") {
}
}
- if (enable_session_service) {
+ if (true) {
sources += [
"sessions/session_restore.cc",
"sessions/session_restore.h",
@@ -5656,7 +5631,7 @@ grit("resources") {
}
}
- if (is_win || is_mac || is_desktop_linux || is_chromeos) {
+ if (is_win || is_mac || is_desktop_linux || is_chromeos || is_android) {
deps += [
"//chrome/browser/resources/discards:discards_resources_gen",
"//chrome/browser/resources/gaia_auth_host:modulize",
--- a/extensions/browser/api/system_cpu/BUILD.gn
+++ b/extensions/browser/api/system_cpu/BUILD.gn
@@ -11,6 +11,7 @@ source_set("system_cpu") {
sources = [
"cpu_info_provider.cc",
"cpu_info_provider.h",
+ "cpu_info_provider_android.cc",
"cpu_info_provider_linux.cc",
"cpu_info_provider_mac.cc",
"cpu_info_provider_win.cc",
--- a/chrome/browser/ui/BUILD.gn
+++ b/chrome/browser/ui/BUILD.gn
@@ -608,7 +608,7 @@ jumbo_static_library("ui") {
allow_circular_includes_from +=
[ "//chrome/browser/ui/webui/bluetooth_internals" ]
- if (is_win || is_mac || is_desktop_linux || is_chromeos) {
+ if (is_win || is_mac || is_desktop_linux || is_chromeos || is_android) {
deps += [ "//chrome/browser/ui/webui/discards:mojo_bindings" ]
}
@@ -838,8 +838,6 @@ jumbo_static_library("ui") {
"//services/device/public/mojom:usb",
"//ui/android",
]
- } else {
- # !is_android
sources += [
"apps/app_info_dialog.h",
"apps/chrome_app_delegate.cc",
@@ -902,7 +900,6 @@ jumbo_static_library("ui") {
"browser_location_bar_model_delegate.h",
"browser_navigator.cc",
"browser_navigator.h",
- "browser_otr_state.cc",
"browser_otr_state.h",
"browser_tab_restorer.cc",
"browser_tab_strip_model_delegate.cc",
@@ -991,12 +988,6 @@ jumbo_static_library("ui") {
"global_media_controls/overlay_media_notification.h",
"global_media_controls/overlay_media_notifications_manager.cc",
"global_media_controls/overlay_media_notifications_manager.h",
- "hats/hats_helper.cc",
- "hats/hats_helper.h",
- "hats/hats_service.cc",
- "hats/hats_service.h",
- "hats/hats_service_factory.cc",
- "hats/hats_service_factory.h",
"hats/hats_survey_status_checker.cc",
"hats/hats_survey_status_checker.h",
"hid/hid_chooser.cc",
@@ -1053,6 +1044,8 @@ jumbo_static_library("ui") {
"media_router/query_result_manager.h",
"media_router/ui_media_sink.cc",
"media_router/ui_media_sink.h",
+ "native_window_tracker_android.cc",
+ "native_window_tracker_android.h",
"native_window_tracker.h",
"omnibox/alternate_nav_infobar_delegate.cc",
"omnibox/alternate_nav_infobar_delegate.h",
@@ -1146,8 +1139,6 @@ jumbo_static_library("ui") {
"singleton_tabs.h",
"startup/automation_infobar_delegate.cc",
"startup/automation_infobar_delegate.h",
- "startup/google_api_keys_infobar_delegate.cc",
- "startup/google_api_keys_infobar_delegate.h",
"startup/obsolete_system_infobar_delegate.cc",
"startup/obsolete_system_infobar_delegate.h",
"startup/startup_browser_creator.cc",
@@ -1222,10 +1213,6 @@ jumbo_static_library("ui") {
"tabs/tab_types.h",
"tabs/tab_utils.cc",
"tabs/tab_utils.h",
- "task_manager/task_manager_columns.cc",
- "task_manager/task_manager_columns.h",
- "task_manager/task_manager_table_model.cc",
- "task_manager/task_manager_table_model.h",
"thumbnails/thumbnail_image.cc",
"thumbnails/thumbnail_image.h",
"thumbnails/thumbnail_tab_helper.cc",
@@ -1366,8 +1353,6 @@ jumbo_static_library("ui") {
"webui/settings/extension_control_handler.h",
"webui/settings/font_handler.cc",
"webui/settings/font_handler.h",
- "webui/settings/hats_handler.cc",
- "webui/settings/hats_handler.h",
"webui/settings/import_data_handler.cc",
"webui/settings/import_data_handler.h",
"webui/settings/languages_handler.cc",
@@ -1440,6 +1425,7 @@ jumbo_static_library("ui") {
"webui/theme_source.h",
"webui/web_footer_experiment_ui.cc",
"webui/web_footer_experiment_ui.h",
+ "window_sizer/window_sizer_android.cc",
"window_sizer/window_sizer.cc",
"window_sizer/window_sizer.h",
"zoom/chrome_zoom_level_otr_delegate.cc",
@@ -1454,7 +1440,6 @@ jumbo_static_library("ui") {
"//chrome/browser/media/router",
"//chrome/browser/profile_resetter:profile_reset_report_proto",
"//chrome/browser/resource_coordinator:tab_metrics_event_proto",
- "//chrome/browser/resource_coordinator/tab_ranker",
"//chrome/browser/safe_browsing:advanced_protection",
"//chrome/browser/ui/color:color_headers",
"//chrome/browser/ui/color:mixers",
@@ -2167,7 +2152,7 @@ jumbo_static_library("ui") {
}
}
- if (is_win || is_mac || is_desktop_linux || is_chromeos) {
+ if (is_win || is_mac || is_desktop_linux || is_chromeos || is_android) {
sources += [
"autofill/payments/virtual_card_selection_dialog_controller.h",
"autofill/payments/virtual_card_selection_dialog_controller_impl.cc",
@@ -2211,10 +2196,6 @@ jumbo_static_library("ui") {
"views/profiles/profile_menu_view_base.h",
"views/profiles/signin_view_controller_delegate_views.cc",
"views/profiles/signin_view_controller_delegate_views.h",
- "webui/discards/discards_ui.cc",
- "webui/discards/discards_ui.h",
- "webui/discards/graph_dump_impl.cc",
- "webui/discards/graph_dump_impl.h",
"webui/discards/site_data_provider_impl.cc",
"webui/discards/site_data_provider_impl.h",
"webui/signin/inline_login_handler.cc",
@@ -2231,7 +2212,7 @@ jumbo_static_library("ui") {
deps += [ "//ui/webui" ]
}
- if (is_win || is_mac || is_desktop_linux) {
+ if (is_win || is_mac || is_linux || is_android) {
sources += [
"bookmarks/bookmark_bubble_sign_in_delegate.cc",
"bookmarks/bookmark_bubble_sign_in_delegate.h",
@@ -2244,10 +2225,7 @@ jumbo_static_library("ui") {
"sync/one_click_signin_links_delegate_impl.h",
"user_manager.cc",
"user_manager.h",
- "views/external_protocol_dialog.cc",
"views/external_protocol_dialog.h",
- "views/profiles/badged_profile_photo.cc",
- "views/profiles/badged_profile_photo.h",
"views/profiles/user_manager_view.cc",
"views/profiles/user_manager_view.h",
"webui/app_launcher_page_ui.cc",
@@ -2622,14 +2600,11 @@ jumbo_static_library("ui") {
}
}
- if (is_desktop_linux) {
+ if (is_desktop_linux || is_android) {
sources += [
"views/apps/chrome_app_window_client_views_linux.cc",
"views/first_run_dialog.cc",
"views/first_run_dialog.h",
- "views/frame/browser_desktop_window_tree_host.h",
- "views/frame/desktop_browser_frame_aura_linux.cc",
- "views/frame/desktop_browser_frame_aura_linux.h",
"views/status_icons/status_icon_button_linux.cc",
"views/status_icons/status_icon_button_linux.h",
"views/status_icons/status_icon_linux_wrapper.cc",
@@ -2639,9 +2614,6 @@ jumbo_static_library("ui") {
"webui/settings_utils_linux.cc",
]
deps += [
- "//ui/base:wm_role_names",
- "//ui/base/ime",
- "//ui/events:dom_keycode_converter",
]
if (use_dbus) {
@@ -2734,7 +2706,7 @@ jumbo_static_library("ui") {
]
}
- if (toolkit_views) {
+ if (true) {
sources += [
"autofill/payments/local_card_migration_bubble.h",
"autofill/payments/local_card_migration_bubble_controller_impl.cc",
@@ -2772,6 +2744,7 @@ jumbo_static_library("ui") {
# This test header is included because it contains forward declarations
# needed for "friend" statements for use in tests.
"translate/translate_bubble_test_utils.h",
+ "views/accelerator_utils_android.cc",
"views/accessibility/caption_bubble.cc",
"views/accessibility/caption_bubble.h",
"views/accessibility/invert_bubble_view.cc",
@@ -2804,12 +2777,8 @@ jumbo_static_library("ui") {
"views/autofill/autofill_bubble_handler_impl.h",
"views/autofill/autofill_popup_base_view.cc",
"views/autofill/autofill_popup_base_view.h",
- "views/autofill/autofill_popup_view_native_views.cc",
- "views/autofill/autofill_popup_view_native_views.h",
"views/autofill/autofill_popup_view_utils.cc",
"views/autofill/autofill_popup_view_utils.h",
- "views/autofill/payments/card_unmask_prompt_views.cc",
- "views/autofill/payments/card_unmask_prompt_views.h",
"views/autofill/payments/dialog_view_ids.h",
"views/autofill/payments/local_card_migration_bubble_views.cc",
"views/autofill/payments/local_card_migration_bubble_views.h",
@@ -2862,8 +2831,6 @@ jumbo_static_library("ui") {
"views/bulleted_label_list_view.h",
"views/certificate_selector.cc",
"views/certificate_selector.h",
- "views/chrome_browser_main_extra_parts_views.cc",
- "views/chrome_browser_main_extra_parts_views.h",
"views/chrome_constrained_window_views_client.cc",
"views/chrome_constrained_window_views_client.h",
"views/chrome_layout_provider.cc",
@@ -2912,6 +2879,7 @@ jumbo_static_library("ui") {
"views/download/download_shelf_view.cc",
"views/download/download_shelf_view.h",
"views/download/download_started_animation_views.cc",
+ "views/dropdown_bar_host_android.cc",
"views/dropdown_bar_host.cc",
"views/dropdown_bar_host.h",
"views/dropdown_bar_host_delegate.h",
@@ -2960,8 +2928,6 @@ jumbo_static_library("ui") {
"views/find_bar_host.h",
"views/find_bar_view.cc",
"views/find_bar_view.h",
- "views/folder_upload_confirmation_view.cc",
- "views/folder_upload_confirmation_view.h",
"views/frame/app_menu_button.cc",
"views/frame/app_menu_button.h",
"views/frame/app_menu_button_observer.h",
@@ -2969,6 +2935,7 @@ jumbo_static_library("ui") {
"views/frame/browser_frame.h",
"views/frame/browser_non_client_frame_view.cc",
"views/frame/browser_non_client_frame_view.h",
+ "views/frame/browser_non_client_frame_view_factory_views.cc",
"views/frame/browser_root_view.cc",
"views/frame/browser_root_view.h",
"views/frame/browser_view.cc",
@@ -2983,12 +2950,15 @@ jumbo_static_library("ui") {
"views/frame/contents_layout_manager.h",
"views/frame/contents_web_view.cc",
"views/frame/contents_web_view.h",
+ "views/frame/desktop_browser_frame_android.cc",
+ "views/frame/desktop_browser_frame_android.h",
"views/frame/immersive_mode_controller.cc",
"views/frame/immersive_mode_controller.h",
"views/frame/immersive_mode_controller_factory_views.cc",
"views/frame/immersive_mode_controller_stub.cc",
"views/frame/immersive_mode_controller_stub.h",
"views/frame/native_browser_frame.h",
+ "views/frame/native_browser_frame_factory_android.cc",
"views/frame/native_browser_frame_factory.cc",
"views/frame/native_browser_frame_factory.h",
"views/frame/system_menu_model_builder.cc",
@@ -3043,8 +3013,6 @@ jumbo_static_library("ui") {
"views/importer/import_lock_dialog_view.h",
"views/infobars/alternate_nav_infobar_view.cc",
"views/infobars/alternate_nav_infobar_view.h",
- "views/infobars/confirm_infobar.cc",
- "views/infobars/confirm_infobar.h",
"views/infobars/infobar_container_view.cc",
"views/infobars/infobar_container_view.h",
"views/infobars/infobar_view.cc",
@@ -3104,12 +3072,8 @@ jumbo_static_library("ui") {
"views/media_router/cast_dialog_view.h",
"views/media_router/cast_toolbar_button.cc",
"views/media_router/cast_toolbar_button.h",
- "views/media_router/cloud_services_dialog_view.cc",
- "views/media_router/cloud_services_dialog_view.h",
"views/media_router/media_remoting_dialog_view.cc",
"views/media_router/media_remoting_dialog_view.h",
- "views/media_router/media_router_dialog_controller_views.cc",
- "views/media_router/media_router_dialog_controller_views.h",
"views/media_router/media_router_views_ui.cc",
"views/media_router/media_router_views_ui.h",
"views/media_router/presentation_receiver_window_factory.cc",
@@ -3119,16 +3083,8 @@ jumbo_static_library("ui") {
"views/media_router/presentation_receiver_window_view.h",
"views/media_router/web_contents_display_observer_view.cc",
"views/media_router/web_contents_display_observer_view.h",
- "views/message_box_dialog.cc",
- "views/message_box_dialog.h",
"views/native_file_system/native_file_system_access_icon_view.cc",
"views/native_file_system/native_file_system_access_icon_view.h",
- "views/native_file_system/native_file_system_directory_access_confirmation_view.cc",
- "views/native_file_system/native_file_system_directory_access_confirmation_view.h",
- "views/native_file_system/native_file_system_permission_view.cc",
- "views/native_file_system/native_file_system_permission_view.h",
- "views/native_file_system/native_file_system_restricted_directory_dialog_view.cc",
- "views/native_file_system/native_file_system_restricted_directory_dialog_view.h",
"views/native_file_system/native_file_system_ui_helpers.cc",
"views/native_file_system/native_file_system_ui_helpers.h",
"views/native_file_system/native_file_system_usage_bubble_view.cc",
@@ -3155,8 +3111,6 @@ jumbo_static_library("ui") {
"views/overlay/back_to_tab_image_button.h",
"views/overlay/close_image_button.cc",
"views/overlay/close_image_button.h",
- "views/overlay/overlay_window_views.cc",
- "views/overlay/overlay_window_views.h",
"views/overlay/playback_image_button.cc",
"views/overlay/playback_image_button.h",
"views/overlay/resize_handle_button.cc",
@@ -3191,8 +3145,6 @@ jumbo_static_library("ui") {
"views/page_info/permission_selector_row.cc",
"views/page_info/permission_selector_row.h",
"views/page_info/permission_selector_row_observer.h",
- "views/page_info/safety_tip_page_info_bubble_view.cc",
- "views/page_info/safety_tip_page_info_bubble_view.h",
"views/passwords/account_chooser_dialog_view.cc",
"views/passwords/account_chooser_dialog_view.h",
"views/passwords/auto_signin_first_run_dialog_view.cc",
@@ -3209,8 +3161,6 @@ jumbo_static_library("ui") {
"views/passwords/password_bubble_view_base.h",
"views/passwords/password_generation_confirmation_view.cc",
"views/passwords/password_generation_confirmation_view.h",
- "views/passwords/password_generation_popup_view_views.cc",
- "views/passwords/password_generation_popup_view_views.h",
"views/passwords/password_items_view.cc",
"views/passwords/password_items_view.h",
"views/passwords/password_save_unsynced_credentials_locally_view.cc",
@@ -3267,8 +3217,6 @@ jumbo_static_library("ui") {
"views/permission_bubble/chooser_bubble_ui.cc",
"views/permission_bubble/permission_prompt_bubble_view.cc",
"views/permission_bubble/permission_prompt_bubble_view.h",
- "views/permission_bubble/permission_prompt_impl.cc",
- "views/permission_bubble/permission_prompt_impl.h",
"views/profiles/avatar_toolbar_button.cc",
"views/profiles/avatar_toolbar_button.h",
"views/profiles/avatar_toolbar_button_delegate.cc",
@@ -3381,6 +3329,7 @@ jumbo_static_library("ui") {
"views/tabs/tab_style_views.h",
"views/tabs/tab_width_constraints.cc",
"views/tabs/tab_width_constraints.h",
+ "views/tabs/window_finder_android.cc",
"views/tabs/window_finder.h",
"views/task_manager_view.cc",
"views/task_manager_view.h",
@@ -3545,8 +3494,6 @@ jumbo_static_library("ui") {
sources += [
"views/create_application_shortcut_view.cc",
"views/create_application_shortcut_view.h",
- "views/ssl_client_certificate_selector.cc",
- "views/ssl_client_certificate_selector.h",
]
}
@@ -3617,9 +3564,6 @@ jumbo_static_library("ui") {
"views/relaunch_notification/relaunch_recommended_timer.h",
"views/relaunch_notification/relaunch_required_dialog_view.cc",
"views/relaunch_notification/relaunch_required_dialog_view.h",
- "views/screen_capture_notification_ui_views.cc",
- "views/sync/dice_bubble_sync_promo_view.cc",
- "views/sync/dice_bubble_sync_promo_view.h",
"views/sync/dice_signin_button_view.cc",
"views/sync/dice_signin_button_view.h",
]
@@ -4159,7 +4103,7 @@ jumbo_static_library("ui") {
"//components/printing/browser",
"//printing",
]
- if (!is_chromeos && !is_android) {
+ if (!is_chromeos && is_android) {
sources += [
"webui/settings/printing_handler.cc",
"webui/settings/printing_handler.h",
--- a/chrome/browser/apps/platform_apps/api/music_manager_private/BUILD.gn
+++ b/chrome/browser/apps/platform_apps/api/music_manager_private/BUILD.gn
@@ -13,6 +13,7 @@ source_set("music_manager_private") {
"device_id.cc",
"device_id.h",
"device_id_chromeos.cc",
+ "device_id_android.cc",
"device_id_linux.cc",
"device_id_mac.cc",
"device_id_win.cc",
--- a/content/public/browser/BUILD.gn
+++ b/content/public/browser/BUILD.gn
@@ -496,7 +496,7 @@ jumbo_source_set("browser_sources") {
sources += [ "remote_cocoa.h" ]
}
- if (!is_android) {
+ if (is_android) {
sources += [
"host_zoom_map.h",
"zoom_level_delegate.h",
--- a/content/browser/BUILD.gn
+++ b/content/browser/BUILD.gn
@@ -2469,7 +2469,7 @@ jumbo_source_set("browser") {
}
defines += [ "APPCACHE_USE_SIMPLE_CACHE" ]
libs += [ "jnigraphics" ]
- } else {
+
# Not Android.
sources += [
# The WebAuthn devtools protocol API is not supported in Android yet.
--- a/chrome/renderer/BUILD.gn
+++ b/chrome/renderer/BUILD.gn
@@ -419,6 +419,8 @@ jumbo_static_library("renderer") {
"net/page_auto_fetcher_helper_android.cc",
"net/page_auto_fetcher_helper_android.h",
]
+
+ deps += [ "//chrome/common/search:generate_chrome_colors_info" ]
}
if (is_chromeos) {
--- a/chrome/common/BUILD.gn
+++ b/chrome/common/BUILD.gn
@@ -424,7 +424,6 @@ static_library("common") {
"media/chrome_media_drm_bridge_client.cc",
"media/chrome_media_drm_bridge_client.h",
]
- } else {
# Non-Android.
public_deps += [ "//chrome/common/importer" ]
}
--- a/chrome/browser/extensions/BUILD.gn
+++ b/chrome/browser/extensions/BUILD.gn
@@ -222,6 +222,7 @@ jumbo_static_library("extensions") {
"api/image_writer_private/operation_manager.h",
"api/image_writer_private/removable_storage_provider.cc",
"api/image_writer_private/removable_storage_provider.h",
+ "api/image_writer_private/removable_storage_provider_android.cc",
"api/image_writer_private/removable_storage_provider_chromeos.cc",
"api/image_writer_private/removable_storage_provider_mac.cc",
"api/image_writer_private/removable_storage_provider_win.cc",
@@ -629,6 +630,8 @@ jumbo_static_library("extensions") {
"global_shortcut_listener_mac.mm",
"global_shortcut_listener_win.cc",
"global_shortcut_listener_win.h",
+ "global_shortcut_listener_android.cc",
+ "global_shortcut_listener_android.h",
"install_gate.h",
"install_observer.cc",
"install_observer.h",
@@ -695,6 +698,8 @@ jumbo_static_library("extensions") {
"sync_bundle.cc",
"sync_bundle.h",
"system_display/display_info_provider.h",
+ "system_display/display_info_provider_android.cc",
+ "system_display/display_info_provider_android.h",
"system_display/display_info_provider_chromeos.cc",
"system_display/display_info_provider_chromeos.h",
"system_display/display_info_provider_mac.cc",
@@ -1116,7 +1121,7 @@ jumbo_static_library("extensions") {
}
}
- if (!is_android) {
+ if (is_android) {
sources += [
"api/processes/processes_api.cc",
"api/processes/processes_api.h",
--- a/chrome/browser/devtools/BUILD.gn
+++ b/chrome/browser/devtools/BUILD.gn
@@ -4,13 +4,13 @@
import("//extensions/buildflags/buildflags.gni")
-if (!is_android) {
+if (is_android) {
import("//build/config/features.gni")
import("//chrome/common/features.gni")
import("//tools/grit/grit_rule.gni")
}
-if (!is_android) {
+if (is_android) {
_inspector_protocol = "//third_party/inspector_protocol"
import("$_inspector_protocol/inspector_protocol.gni")
@@ -99,7 +99,7 @@ static_library("devtools") {
"//ui/events:dom_keycode_converter",
]
- if (!is_android) {
+ if (is_android) {
deps += [
"//chrome:extra_resources",
"//chrome:resources",
@@ -180,19 +180,13 @@ static_library("devtools") {
"url_constants.cc",
"url_constants.h",
]
- if (enable_service_discovery) {
- sources += [
- "device/cast_device_provider.cc",
- "device/cast_device_provider.h",
- ]
- }
}
if (is_mac) {
sources += [ "devtools_dock_tile_mac.mm" ]
} else {
sources += [ "devtools_dock_tile.cc" ]
}
- if (!is_android) {
+ if (is_android) {
deps += [
":protocol_generated_sources",
"//components/subresource_filter/content/browser:browser",
--- a/chrome/browser/ui/webui/discards/BUILD.gn
+++ b/chrome/browser/ui/webui/discards/BUILD.gn
@@ -4,7 +4,7 @@
import("//mojo/public/tools/bindings/mojom.gni")
-if (is_win || is_mac || is_desktop_linux || is_chromeos) {
+if (is_win || is_mac || is_desktop_linux || is_chromeos || is_android) {
mojom("mojo_bindings") {
sources = [
"discards.mojom",
--- a/chrome/common/extensions/api/api_sources.gni
+++ b/chrome/common/extensions/api/api_sources.gni
@@ -72,7 +72,7 @@ schema_sources_ = [
"windows.json",
]
-if (!is_android) {
+if (is_android) {
schema_sources_ += [ "processes.idl" ]
}
--- a/ui/message_center/BUILD.gn
+++ b/ui/message_center/BUILD.gn
@@ -36,7 +36,7 @@ jumbo_component("message_center") {
defines = [ "MESSAGE_CENTER_IMPLEMENTATION" ]
- if (enable_message_center) {
+ if (true) {
deps += [
":message_center_vector_icons",
"//base:i18n",
@@ -88,7 +88,7 @@ jumbo_component("message_center") {
]
}
- if (toolkit_views) {
+ if (true) {
sources += [
"views/desktop_message_popup_collection.cc",
"views/desktop_message_popup_collection.h",
--- a/components/bookmarks/browser/BUILD.gn
+++ b/components/bookmarks/browser/BUILD.gn
@@ -78,7 +78,7 @@ static_library("browser") {
all_dependent_configs = [ "//ui/views:flags" ]
}
- if (toolkit_views && !is_mac) {
+ if (!is_mac) {
sources += [ "bookmark_node_data_views.cc" ]
}
--- a/ui/gfx/animation/BUILD.gn
+++ b/ui/gfx/animation/BUILD.gn
@@ -59,7 +59,7 @@ jumbo_component("animation") {
]
}
- if (!is_android) {
+ if (is_android) {
sources += [
"throb_animation.cc",
"throb_animation.h",
--- a/chrome/chrome_paks.gni
+++ b/chrome/chrome_paks.gni
@@ -121,7 +121,7 @@ template("chrome_extra_paks") {
sources += invoker.additional_paks
}
- if (!is_android) {
+ if (is_android) {
# New paks should be added here by default.
sources += [
"$root_gen_dir/chrome/bookmarks_resources.pak",
--- a/content/browser/devtools/BUILD.gn
+++ b/content/browser/devtools/BUILD.gn
@@ -7,7 +7,7 @@ import("//third_party/protobuf/proto_lib
import("//tools/grit/grit_rule.gni")
group("resources") {
- if (!is_android) {
+ if (is_android) {
public_deps = [ ":devtools_resources" ]
}
}
--- a/build/config/locales.gni
+++ b/build/config/locales.gni
@@ -171,7 +171,7 @@ android_bundle_only_locales = [
]
if (is_android) {
- locales = all_chrome_locales
+ locales = all_chrome_locales - android_bundle_only_locales
# Android doesn't ship all locales on KitKat in order to save space
# (but webview does). http://crbug.com/369218
--- a/chrome/android/BUILD.gn
+++ b/chrome/android/BUILD.gn
@@ -1474,7 +1474,6 @@ if (current_toolchain == default_toolcha
}
}
if (!dfmify_dev_ui || !_is_bundle_module) {
- additional_extra_paks += [ "$root_gen_dir/chrome/dev_ui_resources.pak" ]
deps += [ "//chrome/browser/resources:dev_ui_paks" ]
}
--- a/ui/gfx/BUILD.gn
+++ b/ui/gfx/BUILD.gn
@@ -403,8 +403,6 @@ jumbo_component("gfx") {
if ((!use_aura && !toolkit_views) || is_ios) {
sources -= [
- "nine_image_painter.cc",
- "nine_image_painter.h",
]
}