diff options
37 files changed, 119 insertions, 37 deletions
diff --git a/base/BUILD.gn b/base/BUILD.gn index 6198d92..e5e4aa4 100644 --- a/base/BUILD.gn +++ b/base/BUILD.gn @@ -1341,7 +1341,6 @@ test("base_unittests") { "//base/test:run_all_unittests", "//base/test:test_support", "//base/third_party/dynamic_annotations", - "//base/third_party/nspr", "//testing/gmock", "//testing/gtest", "//third_party/icu", diff --git a/base/third_party/nspr/BUILD.gn b/base/third_party/nspr/BUILD.gn index ddbcbc1..516ca1f 100644 --- a/base/third_party/nspr/BUILD.gn +++ b/base/third_party/nspr/BUILD.gn @@ -3,7 +3,7 @@ # found in the LICENSE file. source_set("nspr") { - visibility = [ "//base/*" ] + visibility = [ "//base" ] sources = [ "prtime.cc", "prtime.h", diff --git a/cc/surfaces/BUILD.gn b/cc/surfaces/BUILD.gn index 46fdfc1..a45e786 100644 --- a/cc/surfaces/BUILD.gn +++ b/cc/surfaces/BUILD.gn @@ -32,6 +32,7 @@ component("surfaces") { "//base/third_party/dynamic_annotations", "//cc", "//skia", + "//ui/events:events_base", "//ui/gfx", "//ui/gfx/geometry", ] diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn index e852cfe..985e208 100644 --- a/chrome/android/BUILD.gn +++ b/chrome/android/BUILD.gn @@ -170,6 +170,10 @@ static_library("chrome_shell_base") { "//skia", ] + # Some android targets still depend on --gc-sections to link. + # TODO: remove --gc-sections for Debug builds (crbug.com/159847). + ldflags = [ "-Wl,--gc-sections" ] + # TODO(GYP): #[ 'order_profiling!=0', { #'conditions': [ @@ -180,24 +184,18 @@ static_library("chrome_shell_base") { #}], } -# TODO(GYP, cjhopman): make chrome_shell_base actually link and then move it to -# deps. Also, actually compile the main delegates at that point. # GYP: //chrome/chrome_shell.gypi:libchromeshell shared_library("chrome_shell") { testonly = true sources = [ # This file must always be included in the shared_library step to ensure # JNI_OnLoad is exported. -#"//chrome/app/android/chrome_jni_onload.cc", -#"shell/chrome_main_delegate_chrome_shell_android.cc", -#"shell/chrome_main_delegate_chrome_shell_android.h", + "//chrome/app/android/chrome_jni_onload.cc", + "shell/chrome_main_delegate_chrome_shell_android.cc", + "shell/chrome_main_delegate_chrome_shell_android.h", ] deps = [ -#":chrome_shell_base", - ] - deps = [ ":chrome_java" ] - datadeps = [ - ":chrome_shell_base" + ":chrome_shell_base", ] } diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn index cf47b3c..f8e1a3b 100644 --- a/chrome/browser/BUILD.gn +++ b/chrome/browser/BUILD.gn @@ -135,7 +135,7 @@ static_library("browser") { "//third_party/zlib:minizip", "//third_party/zlib:zip", "//ui/base", - "//ui/events", + "//ui/events:events_base", "//ui/gfx", "//ui/gfx/geometry", "//ui/message_center", @@ -184,6 +184,7 @@ static_library("browser") { "//content/app/resources", "//media", "//media/cast:net", + "//mojo/common", "//mojo/edk/system", "//mojo/environment:chromium", "//mojo/public/cpp/bindings", @@ -308,7 +309,10 @@ static_library("browser") { sources += rebase_path(gypi_values.chrome_browser_policy_desktop_sources, ".", "//chrome") } - if (!is_android && !is_ios) { # Non-mobile + if (is_android || is_ios) { + sources += rebase_path(gypi_values.chrome_browser_policy_mobile_sources, + ".", "//chrome") + } else { deps += [ "//chrome/browser/policy:path_parser", ] @@ -492,7 +496,10 @@ static_library("browser") { deps += [ ":jni_headers", "//components/cdm/browser", - #"../components/components.gyp:web_contents_delegate_android", TODO(GYP) + "//components/enhanced_bookmarks", + "//components/history/core/android", + "//components/web_contents_delegate_android", + "//third_party/android_opengl/etc1", ] deps -= [ "//third_party/libaddressinput", diff --git a/chrome/browser/safe_browsing/safe_browsing_service.cc b/chrome/browser/safe_browsing/safe_browsing_service.cc index f100f9b..f991e27 100644 --- a/chrome/browser/safe_browsing/safe_browsing_service.cc +++ b/chrome/browser/safe_browsing/safe_browsing_service.cc @@ -360,8 +360,12 @@ SafeBrowsingDatabaseManager* SafeBrowsingService::CreateDatabaseManager() { } void SafeBrowsingService::RegisterAllDelayedAnalysis() { +#if defined(FULL_SAFE_BROWSING) safe_browsing::RegisterBinaryIntegrityAnalysis(); safe_browsing::RegisterBlacklistLoadAnalysis(); +#else + NOTREACHED(); +#endif } void SafeBrowsingService::InitURLRequestContextOnIOThread( diff --git a/chrome/chrome_common.gypi b/chrome/chrome_common.gypi index 3e0c727..4661174 100644 --- a/chrome/chrome_common.gypi +++ b/chrome/chrome_common.gypi @@ -270,6 +270,7 @@ }, 'targets': [ { + # GN: //chrome/common:common 'target_name': 'common', 'type': 'static_library', 'variables': { diff --git a/chrome/renderer/BUILD.gn b/chrome/renderer/BUILD.gn index e73ea58..1c7cfad 100644 --- a/chrome/renderer/BUILD.gn +++ b/chrome/renderer/BUILD.gn @@ -40,6 +40,7 @@ static_library("renderer") { "//components/data_reduction_proxy/core/common", "//components/error_page/renderer", "//components/password_manager/content/renderer", + "//components/plugins/renderer", "//components/startup_metric_utils", "//components/translate/content/renderer", "//components/translate/core/common", @@ -77,7 +78,6 @@ static_library("renderer") { ".", "..") deps += [ "//components/pdf/renderer", - "//components/plugins/renderer", "//ppapi:ppapi_host", "//ppapi:ppapi_ipc", "//ppapi:ppapi_proxy", diff --git a/components/bookmarks.gypi b/components/bookmarks.gypi index b9a7268..fdf382d 100644 --- a/components/bookmarks.gypi +++ b/components/bookmarks.gypi @@ -60,6 +60,9 @@ ], 'conditions': [ ['OS == "android"', { + # In GN, this android-specific stuff is its own target at + # //components/bookmarks/common/android + # TODO(cjhopman): This should be its own target in Gyp, too. 'dependencies': [ 'bookmarks_jni_headers', ], diff --git a/components/bookmarks/common/BUILD.gn b/components/bookmarks/common/BUILD.gn index 283b85be..320d463 100644 --- a/components/bookmarks/common/BUILD.gn +++ b/components/bookmarks/common/BUILD.gn @@ -13,4 +13,9 @@ source_set("common") { deps = [ "//base", ] + if (is_android) { + deps += [ + "//components/bookmarks/common/android", + ] + } } diff --git a/components/bookmarks/common/android/BUILD.gn b/components/bookmarks/common/android/BUILD.gn index bd8fee368..ffe2566 100644 --- a/components/bookmarks/common/android/BUILD.gn +++ b/components/bookmarks/common/android/BUILD.gn @@ -4,6 +4,18 @@ import("//build/config/android/rules.gni") +# GYP: //components/bookmarks.gyp:bookmarks_browser (android part) +source_set("android") { + sources = [ + "bookmark_id.cc", + "bookmark_id.h", + "bookmark_type_list.h", + "component_jni_registrar.cc", + "component_jni_registrar.h", + ] + deps = [ ":bookmarks_jni_headers" ] +} + # GYP: //components/bookmarks.gyp:bookmarks_java android_library("bookmarks_java") { deps = [ diff --git a/components/cdm/renderer/BUILD.gn b/components/cdm/renderer/BUILD.gn index 9652a6c..ef4d03d 100644 --- a/components/cdm/renderer/BUILD.gn +++ b/components/cdm/renderer/BUILD.gn @@ -19,7 +19,7 @@ static_library("renderer") { "//base", "//components/cdm/common", "//content/public/renderer", - "//media/base", + "//media", "//third_party/widevine/cdm:version_h", ] } diff --git a/components/dom_distiller/core/BUILD.gn b/components/dom_distiller/core/BUILD.gn index e20a4ad..be5816e 100644 --- a/components/dom_distiller/core/BUILD.gn +++ b/components/dom_distiller/core/BUILD.gn @@ -3,7 +3,7 @@ # found in the LICENSE file. # GYP version: components/dom_distiller.gypi:dom_distiller_core -static_library("core") { +source_set("core") { sources = [ "../android/component_jni_registrar.cc", "../android/component_jni_registrar.h", @@ -63,6 +63,10 @@ static_library("core") { ] if (is_android) { + sources += [ + "dom_distiller_service_android.cc", + "dom_distiller_service_android.h", + ] deps += [ ":jni_headers" ] } } diff --git a/components/keyed_service/content/BUILD.gn b/components/keyed_service/content/BUILD.gn index a445307..80f204e 100644 --- a/components/keyed_service/content/BUILD.gn +++ b/components/keyed_service/content/BUILD.gn @@ -28,6 +28,7 @@ component("content") { "//base:prefs", "//base/third_party/dynamic_annotations", "//content/public/common", + "//components/keyed_service/core", "//components/user_prefs", ] } diff --git a/components/sessions/BUILD.gn b/components/sessions/BUILD.gn index 68b84d2..bf9182f 100644 --- a/components/sessions/BUILD.gn +++ b/components/sessions/BUILD.gn @@ -24,6 +24,7 @@ source_set("sessions_core") { deps = [ "//base", "//skia", + "//third_party/protobuf:protobuf_lite", "//ui/base", "//url", ] diff --git a/content/app/BUILD.gn b/content/app/BUILD.gn index f68c6de..8d70a51 100644 --- a/content/app/BUILD.gn +++ b/content/app/BUILD.gn @@ -2,6 +2,9 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. +# TODO(GYP) enable chrome_multiple_dll support +is_chrome_multiple_dll = false + content_app_sources = [ "android/app_jni_registrar.cc", "android/app_jni_registrar.h", @@ -63,6 +66,10 @@ content_app_extra_configs = [ "//content:content_implementation", ] +if (!is_chrome_multiple_dll) { + content_app_deps += [ "//content/gpu" ] +} + # This includes the app sources for both the browser and child processes. source_set("both") { # Only the public target should depend on this. All other targets (even @@ -74,9 +81,6 @@ source_set("both") { deps = content_app_deps } -# TODO(GYP) enable chrome_multiple_dll support -is_chrome_multiple_dll = false - if (is_chrome_multiple_dll) { # It doesn't make sense to do the browser/child dll split in component mode. assert(!is_component_build) diff --git a/content/common/BUILD.gn b/content/common/BUILD.gn index 7d0cf0fd..0417e92 100644 --- a/content/common/BUILD.gn +++ b/content/common/BUILD.gn @@ -59,6 +59,7 @@ source_set("common") { "//third_party/icu", "//ui/accessibility", "//ui/base", + "//ui/events/ipc", "//ui/gfx", "//ui/gfx/geometry", "//ui/gfx/ipc", diff --git a/gpu/BUILD.gn b/gpu/BUILD.gn index 8239940..bf13b05 100644 --- a/gpu/BUILD.gn +++ b/gpu/BUILD.gn @@ -117,12 +117,15 @@ test("gl_tests") { "//gpu/command_buffer/client:gles2_implementation_client_side_arrays", ] + libs = [] + + if (is_android) { + deps += [ + "//testing/android:native_test_native_code", + ] + libs += [ "android" ] + } # TODO(GYP) - # ['OS == "android"', { - # 'dependencies': [ - # '../testing/android/native_test.gyp:native_test_native_code', - # ], - # }], # ['OS == "win"', { # 'dependencies': [ # '../third_party/angle/src/build_angle.gyp:libEGL', diff --git a/media/audio/BUILD.gn b/media/audio/BUILD.gn index d89881e..48f1453 100644 --- a/media/audio/BUILD.gn +++ b/media/audio/BUILD.gn @@ -34,6 +34,7 @@ if (!link_pulseaudio) { } source_set("audio") { + visibility = [ "//media/*" ] sources = [ "agc_audio_stream.h", "audio_device_name.cc", diff --git a/media/base/BUILD.gn b/media/base/BUILD.gn index 61fc291..1e1fa4b 100644 --- a/media/base/BUILD.gn +++ b/media/base/BUILD.gn @@ -9,6 +9,7 @@ import("//build/config/linux/pkg_config.gni") import("//media/media_options.gni") source_set("base") { + visibility = [ "//media/*" ] sources = [ "audio_block_fifo.cc", "audio_block_fifo.h", diff --git a/media/base/android/BUILD.gn b/media/base/android/BUILD.gn index 9e4db09..fb834d9 100644 --- a/media/base/android/BUILD.gn +++ b/media/base/android/BUILD.gn @@ -47,7 +47,11 @@ source_set("android") { configs += [ "//media:media_config" ] deps = [ ":media_jni_headers", + "//media:shared_memory_support", + "//media/base", "//third_party/widevine/cdm:version_h", + "//ui/gl", + "//url", ] } diff --git a/media/blink/BUILD.gn b/media/blink/BUILD.gn index 67682d6..078b824 100644 --- a/media/blink/BUILD.gn +++ b/media/blink/BUILD.gn @@ -14,6 +14,7 @@ component("blink") { "//third_party/WebKit/public:blink", "//ui/gfx", "//ui/gfx/geometry", + "//url", ] defines = [ "MEDIA_IMPLEMENTATION" ] diff --git a/media/media.gyp b/media/media.gyp index f3b2817..d6e9594 100644 --- a/media/media.gyp +++ b/media/media.gyp @@ -201,12 +201,6 @@ 'audio/win/wavein_input_win.h', 'audio/win/waveout_output_win.cc', 'audio/win/waveout_output_win.h', - 'base/android/demuxer_android.h', - 'base/android/demuxer_stream_player_params.cc', - 'base/android/demuxer_stream_player_params.h', - 'base/android/media_player_manager.h', - 'base/android/media_resource_getter.cc', - 'base/android/media_resource_getter.h', 'base/audio_block_fifo.cc', 'base/audio_block_fifo.h', 'base/audio_buffer.cc', @@ -1776,6 +1770,9 @@ 'base/android/audio_decoder_job.cc', 'base/android/audio_decoder_job.h', 'base/android/browser_cdm_factory_android.cc', + 'base/android/demuxer_android.h', + 'base/android/demuxer_stream_player_params.cc', + 'base/android/demuxer_stream_player_params.h', 'base/android/media_codec_bridge.cc', 'base/android/media_codec_bridge.h', 'base/android/media_common_android.h', @@ -1791,6 +1788,9 @@ 'base/android/media_player_bridge.h', 'base/android/media_player_listener.cc', 'base/android/media_player_listener.h', + 'base/android/media_player_manager.h', + 'base/android/media_resource_getter.cc', + 'base/android/media_resource_getter.h', 'base/android/media_source_player.cc', 'base/android/media_source_player.h', 'base/android/media_url_interceptor.h', diff --git a/mojo/converters/surfaces/BUILD.gn b/mojo/converters/surfaces/BUILD.gn index 534ea00..ee2d2bb 100644 --- a/mojo/converters/surfaces/BUILD.gn +++ b/mojo/converters/surfaces/BUILD.gn @@ -31,5 +31,6 @@ component("surfaces") { "//mojo/public/c/system:for_component", "//mojo/services/public/interfaces/surfaces:surface_id", "//mojo/services/public/interfaces/surfaces", + "//skia", ] } diff --git a/mojo/gles2/BUILD.gn b/mojo/gles2/BUILD.gn index 4e1e13d..d6e2edb 100644 --- a/mojo/gles2/BUILD.gn +++ b/mojo/gles2/BUILD.gn @@ -20,6 +20,7 @@ component("gles2") { "//base", "//base/third_party/dynamic_annotations", "//gpu/command_buffer/client", + "//gpu/command_buffer/client:gles2_cmd_helper", "//gpu/command_buffer/client:gles2_implementation", "//gpu/command_buffer/client:gles2_interface", "//gpu/command_buffer/common", diff --git a/mojo/services/html_viewer/BUILD.gn b/mojo/services/html_viewer/BUILD.gn index 07d09f5..b362140 100644 --- a/mojo/services/html_viewer/BUILD.gn +++ b/mojo/services/html_viewer/BUILD.gn @@ -47,8 +47,6 @@ shared_library("html_viewer") { "//cc/blink", "//cc/surfaces", "//media", - "//media/audio", - "//media/base", "//media/blink", "//media/mojo", "//mojo/application", diff --git a/mojo/services/native_viewport/BUILD.gn b/mojo/services/native_viewport/BUILD.gn index 9c30fa5..856d3daf 100644 --- a/mojo/services/native_viewport/BUILD.gn +++ b/mojo/services/native_viewport/BUILD.gn @@ -63,12 +63,15 @@ source_set("lib") { "viewport_surface.h", ] + libs = [] + if (is_ios) { sources += [ "platform_viewport_stub.cc" ] } if (is_android) { deps += [ "//mojo:jni_headers" ] + libs += [ "android" ] } if (use_x11) { diff --git a/ppapi/BUILD.gn b/ppapi/BUILD.gn index ba97e32..62862ea 100644 --- a/ppapi/BUILD.gn +++ b/ppapi/BUILD.gn @@ -417,12 +417,14 @@ component("ppapi_shared") { "//base:i18n", "//base/third_party/dynamic_annotations", "//gpu/command_buffer/client", + "//gpu/command_buffer/client:gles2_cmd_helper", "//gpu/command_buffer/client:gles2_implementation", "//gpu/command_buffer/common", "//ipc", "//media:shared_memory_support", "//skia", "//third_party/icu:icuuc", + "//ui/events:events_base", "//ui/surface", "//url", ] @@ -740,6 +742,7 @@ component("ppapi_proxy") { "//ipc", "//skia", "//third_party/icu", + "//ui/events:events_base", "//ui/surface", blink_target, ] @@ -782,6 +785,7 @@ component("ppapi_host") { "//base", "//ipc", "//media:shared_memory_support", + "//ui/events:events_base", "//ui/surface", "//url", ] diff --git a/testing/android/BUILD.gn b/testing/android/BUILD.gn index c26830c..eefa22d 100644 --- a/testing/android/BUILD.gn +++ b/testing/android/BUILD.gn @@ -10,6 +10,7 @@ source_set("native_test_native_code") { sources = [ "native_test_launcher.cc" ] + libs = [ "log" ] deps = [ ":native_test_jni_headers", ":native_test_util", diff --git a/third_party/android_opengl/etc1/BUILD.gn b/third_party/android_opengl/etc1/BUILD.gn new file mode 100644 index 0000000..48f52c0 --- /dev/null +++ b/third_party/android_opengl/etc1/BUILD.gn @@ -0,0 +1,13 @@ +# Copyright 2014 The Chromium Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +assert(is_android) + +# GYP: //third_party/android_opengl/etc1/etc1.gyp:etc1 +source_set("etc1") { + sources = [ + "etc1.cpp", + "etc1.h", + ] +} diff --git a/third_party/android_opengl/etc1/etc1.gyp b/third_party/android_opengl/etc1/etc1.gyp index bd9d4bf..3445a67 100644 --- a/third_party/android_opengl/etc1/etc1.gyp +++ b/third_party/android_opengl/etc1/etc1.gyp @@ -5,6 +5,7 @@ { 'targets': [ { + # GN: //third_party/android_opengl/etc1:etc1 'target_name': 'etc1', 'type': 'static_library', 'sources': [ diff --git a/third_party/cld/BUILD.gn b/third_party/cld/BUILD.gn index 30af5b8..ed4075d 100644 --- a/third_party/cld/BUILD.gn +++ b/third_party/cld/BUILD.gn @@ -7,7 +7,10 @@ config("cld_config") { include_dirs = [ "." ] } -static_library("cld") { +source_set("cld") { + # The /win/ directory is used on all platforms. + set_sources_assignment_filter([]) + # This target includes its own copy of "base" which confuses the header # checker. check_includes = false diff --git a/ui/base/BUILD.gn b/ui/base/BUILD.gn index 4e9515a..d58b4f4 100644 --- a/ui/base/BUILD.gn +++ b/ui/base/BUILD.gn @@ -600,6 +600,8 @@ component("base") { if (is_android) { sources -= [ + "cursor/image_cursors.cc", + "cursor/image_cursors.h", "default_theme_provider.cc", "dragdrop/drag_utils.cc", "dragdrop/drag_utils.h", diff --git a/ui/events/ipc/BUILD.gn b/ui/events/ipc/BUILD.gn index 0462410..e369772 100644 --- a/ui/events/ipc/BUILD.gn +++ b/ui/events/ipc/BUILD.gn @@ -14,6 +14,7 @@ component("ipc") { defines = [ "EVENTS_IMPLEMENTATION" ] deps = [ + "//base", "//ipc", "//ui/events", ] diff --git a/ui/gfx/BUILD.gn b/ui/gfx/BUILD.gn index 080c7d5..455066e 100644 --- a/ui/gfx/BUILD.gn +++ b/ui/gfx/BUILD.gn @@ -345,6 +345,9 @@ component("gfx") { deps += [ "//ui/gfx/x", ] + configs += [ + "//build/config/linux:x11", + ] } else { sources -= [ "path_x11.cc", diff --git a/ui/gfx/ipc/BUILD.gn b/ui/gfx/ipc/BUILD.gn index 8f11fa8..b7b8efc 100644 --- a/ui/gfx/ipc/BUILD.gn +++ b/ui/gfx/ipc/BUILD.gn @@ -16,6 +16,6 @@ component("ipc") { "//base", "//ipc", "//skia", - "//ui/gfx", + "//ui/gfx/geometry", ] } diff --git a/ui/gfx/x/BUILD.gn b/ui/gfx/x/BUILD.gn index dfc50b3..795aae3 100644 --- a/ui/gfx/x/BUILD.gn +++ b/ui/gfx/x/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. -# GYP version: //ui/gfx/gfx_x11.gyp:gfx_x11 +# GYP version: //ui/gfx/x/gfx_x11.gyp:gfx_x11 component("x") { output_name = "gfx_x11" |