GN: Fix Android component build

chrome/browser/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.
 
 import("//build/config/crypto.gni")
 import("//build/config/features.gni")
 import("//build/config/ui.gni")
 import("//components/nacl/nacl_defines.gni")
 # //build/config/android/rules.gni imports //tools/grit/grit_rule.gni, which
 # produces a conflict for the "grit" template so we have to only include one.
@@ skipping 115 matching lines @@
     "//sync",
     "//third_party/cacheinvalidation",
     "//third_party/icu",
     "//third_party/libxml",
     "//third_party/libjingle",
     "//third_party/widevine/cdm:version_h",
     "//third_party/zlib",
     "//third_party/zlib:minizip",
     "//third_party/zlib:zip",
     "//ui/base",
-    "//ui/events",
+    "//ui/events:events_base",
     "//ui/gfx",
     "//ui/gfx/geometry",
     "//ui/message_center",
     "//ui/shell_dialogs",
     "//ui/strings",
     "//ui/resources",
   ]
 
   sources += rebase_path(gypi_values.chrome_browser_undo_sources,
                          ".", "//chrome")
@@ skipping 28 matching lines @@
       "//components/storage_monitor",
       "//components/translate/content/browser",
       "//components/url_matcher",
       "//components/visitedlink/browser",
       "//components/visitedlink/common",
       "//components/web_cache/browser",
       "//components/web_modal",
       "//content/app/resources",
       "//media",
       "//media/cast:net",
+      "//mojo/common",
       "//mojo/edk/system",
       "//mojo/environment:chromium",
       "//mojo/public/cpp/bindings",
       "//mojo/public/js/bindings",
       "//net:extras",
       "//net:net_with_v8",
       "//storage/browser",
       "//storage/common",
       "//third_party/WebKit/public:resources",
       "//third_party/expat",
@@ skipping 104 matching lines @@
     }
     if (!is_chromeos) {
       sources += rebase_path(
           gypi_values.chrome_browser_policy_shared_with_ios_not_chromeos_sources,
           ".", "//chrome")
     }
     if (is_win || is_mac || is_desktop_linux) {
       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",
       ]
     }
   } else {
     # Configuration policy disabled.
     sources += rebase_path(gypi_values.chrome_browser_policy_disabled_sources,
                            ".", "//chrome")
   }
 
@@ skipping 163 matching lines @@
       "//device/usb",
     ]
   }
 
   if (is_android) {
     sources += rebase_path(gypi_values.chrome_browser_android_sources,
                            ".", "//chrome")
     deps += [
       ":jni_headers",
       "//components/cdm/browser",
-      #"../components/components.gyp:web_contents_delegate_android",  TODO(GYP)
+      "//components/enhanced_bookmarks",
+      "//components/web_contents_delegate_android",

[Lei Zhang, 2014/10/24 02:55:51]

nit: alphabetical order please.

[cjhopman, 2014/10/24 21:41:11]

Done.

+      "//components/history/core/android",
+      "//third_party/android_opengl/etc1",
     ]
     deps -= [
       "//third_party/libaddressinput",
       "//components/feedback",
       "//components/storage_monitor",
       "//components/web_modal",
     ]
   } else {
     sources += rebase_path(gypi_values.chrome_browser_non_android_sources,
                            ".", "//chrome")
@@ skipping 440 matching lines @@
     ]
   }
 
   if (enable_wifi_bootstrapping) {
     sources += [
       "local_discovery/wifi/mock_wifi_manager.cc",
       "local_discovery/wifi/mock_wifi_manager.h",
     ]
   }
 }