diff --git a/chromiumcontent/BUILD.gn b/chromiumcontent/BUILD.gn index 6ec370f6..cfd5c26e 100644 --- a/chromiumcontent/BUILD.gn +++ b/chromiumcontent/BUILD.gn @@ -34,7 +34,7 @@ group("targets") { ] if (is_linux) { - deps += [ "//chrome/browser/ui/libgtkui:libgtk2ui" ] + deps += [ "//chrome/browser/ui/libgtkui:libgtk3ui" ] } if (is_component_build) { @@ -156,13 +156,13 @@ if (is_electron_build && is_component_build) { static_library("libgtkui") { complete_static_lib = true sources = [ - "$root_out_dir/obj/chrome/browser/ui/libgtkui/libgtk2ui/app_indicator_icon.o", - "$root_out_dir/obj/chrome/browser/ui/libgtkui/libgtk2ui/app_indicator_icon_menu.o", - "$root_out_dir/obj/chrome/browser/ui/libgtkui/libgtk2ui/gtk_util.o", - "$root_out_dir/obj/chrome/browser/ui/libgtkui/libgtk2ui/gtk_status_icon.o", - "$root_out_dir/obj/chrome/browser/ui/libgtkui/libgtk2ui/menu_util.o", - "$root_out_dir/obj/chrome/browser/ui/libgtkui/libgtk2ui/skia_utils_gtk.o", - "$root_out_dir/obj/chrome/browser/ui/libgtkui/libgtk2ui/unity_service.o", + "$root_out_dir/obj/chrome/browser/ui/libgtkui/libgtk3ui/app_indicator_icon.o", + "$root_out_dir/obj/chrome/browser/ui/libgtkui/libgtk3ui/app_indicator_icon_menu.o", + "$root_out_dir/obj/chrome/browser/ui/libgtkui/libgtk3ui/gtk_util.o", + "$root_out_dir/obj/chrome/browser/ui/libgtkui/libgtk3ui/gtk_status_icon.o", + "$root_out_dir/obj/chrome/browser/ui/libgtkui/libgtk3ui/menu_util.o", + "$root_out_dir/obj/chrome/browser/ui/libgtkui/libgtk3ui/skia_utils_gtk.o", + "$root_out_dir/obj/chrome/browser/ui/libgtkui/libgtk3ui/unity_service.o", ] } } diff --git a/script/update b/script/update index 7e1526db..b06c1406 100755 --- a/script/update +++ b/script/update @@ -310,29 +310,26 @@ def run_gn(target_arch, defines): args = 'import("//chromiumcontent/args/{0}.gn") target_cpu="{1}"'.format(component, target_cpu) if sys.platform in ['win32', 'cygwin']: args += ' use_allocator_shim=false' - if sys.platform == 'linux2': - args += ' use_gtk3=false' - if target_arch == 'mips64el': - args += ' clang_use_chrome_plugins=false' - args += ' enable_hangout_services_extension=true' - args += ' enable_nacl_nonsfi=false' - args += ' fatal_linker_warnings=false' - args += ' fieldtrial_testing_like_official_build=true' - args += ' is_clang=false' - args += ' link_pulseaudio=true' - args += ' linux_use_bundled_binutils=false' - args += ' remove_webcore_debug_symbols=true' - args += ' treat_warnings_as_errors=false' - args += ' use_allocator="none"' - args += ' use_cups=true' - args += ' use_gconf=false' - args += ' use_gnome_keyring=false' - args += ' use_gold=false' - args += ' use_kerberos=true' - args += ' use_pulseaudio=true' - if IS_MIPS64EL_HOST: - args += ' use_sysroot=false' - + if sys.platform == 'linux2' and target_arch == 'mips64el': + args += ' clang_use_chrome_plugins=false' + args += ' enable_hangout_services_extension=true' + args += ' enable_nacl_nonsfi=false' + args += ' fatal_linker_warnings=false' + args += ' fieldtrial_testing_like_official_build=true' + args += ' is_clang=false' + args += ' link_pulseaudio=true' + args += ' linux_use_bundled_binutils=false' + args += ' remove_webcore_debug_symbols=true' + args += ' treat_warnings_as_errors=false' + args += ' use_allocator="none"' + args += ' use_cups=true' + args += ' use_gconf=false' + args += ' use_gnome_keyring=false' + args += ' use_gold=false' + args += ' use_kerberos=true' + args += ' use_pulseaudio=true' + if IS_MIPS64EL_HOST: + args += ' use_sysroot=false' output_dir = get_output_dir(SOURCE_ROOT, target_arch, component) subprocess.call([gn, 'gen', os.path.relpath(output_dir, SRC_DIR), '--args=' + args], cwd=SRC_DIR, env=env)