GN: Fix Android component build

This change makes all libraries in the Android component build link
successfully (including fixing and enabling libchrome_shell). This also makes
all the libraries link in a component build for Linux, but without bot coverage
for that platform it'll surely regress.

This is almost entirely just fixing some missing/incorrect dependencies and
adding missing source files for Android.

Some targets were depending on an internal source_set/static_library when they
should have been (or already were) depending on the corresponding component. In
these cases, I added some visibility restrictions to those internal targets to
try to prevent those types of dependencies from coming back.

BUG=359249

Review URL: https://codereview.chromium.org/666813002

Cr-Commit-Position: refs/heads/master@{#301386}

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",

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",

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",
   ]

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",
   ]
 }
 

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",

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(

chrome/chrome_common.gypi

@@ -270,6 +270,7 @@
   },
   'targets': [
     {
+      # GN: //chrome/common:common
       'target_name': 'common',
       'type': 'static_library',
       'variables': {

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",

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',
           ],

components/bookmarks/common/BUILD.gn

@@ -13,4 +13,9 @@ source_set("common") {
   deps = [
     "//base",
   ]
+  if (is_android) {
+    deps += [
+      "//components/bookmarks/common/android",
+    ]
+  }
 }

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 = [

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",
   ]
 }

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" ]
   }
 }

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",
   ]
 }

components/sessions/BUILD.gn

@@ -24,6 +24,7 @@ source_set("sessions_core") {
   deps = [
     "//base",
     "//skia",
+    "//third_party/protobuf:protobuf_lite",
     "//ui/base",
     "//url",
   ]

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)

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",

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',

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",

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",

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",
   ]
 }
 

media/blink/BUILD.gn

@@ -14,6 +14,7 @@ component("blink") {
     "//third_party/WebKit/public:blink",
     "//ui/gfx",
     "//ui/gfx/geometry",
+    "//url",
   ]
 
   defines = [ "MEDIA_IMPLEMENTATION" ]

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',

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",
   ]
 }

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",

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",

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) {

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",
   ]

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",

third_party/android_opengl/etc1/BUILD.gn

+# 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",
+  ]
+}

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': [

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

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",

ui/events/ipc/BUILD.gn

@@ -14,6 +14,7 @@ component("ipc") {
   defines = [ "EVENTS_IMPLEMENTATION" ]
 
   deps = [
+    "//base",
     "//ipc",
     "//ui/events",
   ]

ui/gfx/BUILD.gn

@@ -345,6 +345,9 @@ component("gfx") {
     deps += [
       "//ui/gfx/x",
     ]
+    configs += [
+      "//build/config/linux:x11",
+    ]
   } else {
     sources -= [
       "path_x11.cc",

ui/gfx/ipc/BUILD.gn

@@ -16,6 +16,6 @@ component("ipc") {
     "//base",
     "//ipc",
     "//skia",
-    "//ui/gfx",
+    "//ui/gfx/geometry",
   ]
 }

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"