Merge from Chromium at DEPS revision 267aeeb8d85c
This commit was generated by merge_to_master.py.
Change-Id: Id3aac9713b301fae64408cdaee0888724eeb7c0e
diff --git a/BUILD.gn b/BUILD.gn
index b5c99e8..f9c0110 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -10,19 +10,11 @@
import("//build/config/ui.gni")
-# Android GN build has some bugs: http://crbug.com/405686
-if (is_android) {
-
-group("root") {
- deps = [
- "//base",
- ]
-}
-
-} else {
-
# In GN, a "group" is a dummy target that just lists other targets.
group("root") {
+ # This should not be linked into production and depends on test targets.
+ testonly = true
+
# Note that some dependencies are commented out. These are things that are
# currently written but not hooked up to the build yet. They may need to be
# completed or possibly just tested and then re-enabled.
@@ -33,12 +25,9 @@
"//cc/blink",
"//chrome/browser",
"//chrome/browser/devtools",
- "//chrome/browser/ui",
- "//chrome/browser/ui/views",
"//chrome/common",
"//chrome/plugin",
"//chrome/renderer",
- "//chrome/service",
"//chrome/utility",
"//components:all_components",
"//content",
@@ -47,7 +36,6 @@
"//crypto",
"//device/bluetooth",
"//device/nfc",
- "//device/usb",
"//extensions/browser",
"//extensions/common",
"//extensions/common/api",
@@ -58,16 +46,21 @@
"//google_apis/gcm",
"//ipc",
"//ipc/mojo",
+ "//jingle:notifier",
"//media",
+ "//media/blink",
"//media/cast",
+ "//media/mojo",
"//mojo",
"//net",
"//pdf",
"//ppapi:ppapi_c",
"//printing",
+ "//remoting/client/plugin",
"//sandbox",
"//sdch",
"//skia",
+ "//storage/browser",
"//sql",
"//sync",
"//third_party/WebKit/public:all_blink",
@@ -83,14 +76,15 @@
"//third_party/iccjpeg",
"//third_party/icu",
"//third_party/leveldatabase",
- "//third_party/libaddressinput",
"//third_party/libphonenumber",
+ "//third_party/libjingle",
"//third_party/libpng",
"//third_party/libsrtp",
"//third_party/libusb",
"//third_party/libwebm",
"//third_party/libwebp",
"//third_party/libxslt",
+ "//third_party/libvpx",
"//third_party/libyuv",
"//third_party/lzma_sdk",
"//third_party/mesa",
@@ -104,15 +98,16 @@
"//third_party/smhasher:pmurhash",
"//third_party/snappy",
"//third_party/speex",
+ "//third_party/usrsctp",
"//third_party/widevine/cdm:version_h",
+ "//third_party/webrtc",
"//third_party/zlib",
"//third_party:jpeg",
"//tools/gn",
"//tools/imagediff($host_toolchain)",
- "//ui:ui_unittests",
+ "//ui/accessibility",
"//ui/app_list",
"//ui/aura",
- "//ui/accessibility",
"//ui/base",
"//ui/display",
"//ui/events",
@@ -127,11 +122,8 @@
"//ui/views",
"//ui/views/controls/webview",
"//ui/web_dialogs",
- "//ui/wm",
"//url",
"//v8:v8",
- "//webkit/browser:storage",
- "//webkit/child",
]
if (!is_win) {
@@ -150,6 +142,10 @@
deps += [ "//tools/xdisplaycheck" ]
}
+ if (use_aura) {
+ deps += [ "//ui/wm" ]
+ }
+
if (is_win) {
deps += [
"//ui/metro_viewer",
@@ -170,43 +166,35 @@
if (is_android) {
deps += [
+ "//third_party/openmax_dl/dl",
+ "//content/shell/android:content_shell_apk",
"//ui/android:ui_java",
- "//third_party/guava:guava_javalib",
"//third_party/android_tools:android_gcm_java",
"//third_party/android_tools:uiautomator_java",
"//third_party/android_tools:android_support_v13_java",
"//third_party/android_tools:android_support_v7_appcompat_java",
"//third_party/android_tools:android_support_v7_mediarouter_java",
+ "//third_party/eyesfree:eyesfree_java",
]
deps -= [
"//apps", # Needs testing.
- "//cc/blink", # Blocked on blink
- "//chrome/browser", # Blocked on content.
- "//chrome/browser/devtools", # Blocked on content.
- "//chrome/browser/ui", # Blocked on content.
- "//chrome/browser/ui/views", # Blocked on content.
- "//chrome/common", # Blocked on content.
- "//chrome/plugin", # Blocked on content.
- "//chrome/renderer", # Blocked on content.
- "//chrome/service", # Blocked on content.
- "//chrome/utility", # Blocked on content.
- "//content",
- "//content/shell:content_shell", # Blocked on content.
- "//content/test:test_support", # Blocked on content.
+ "//chrome/browser",
+ "//chrome/browser/devtools",
+ "//chrome/common",
+ "//chrome/plugin",
+ "//chrome/renderer",
+ "//chrome/utility",
+ "//content/shell:content_shell",
"//extensions/browser",
"//extensions/common",
"//extensions/common/api",
"//extensions/renderer",
"//pdf", # Not compiled on Android in GYP yet, either.
"//ppapi:ppapi_c",
- "//sandbox",
"//third_party/libusb",
"//ui/keyboard", # Blocked on content.
- # Blocked on neon stuff in vp8
- "//third_party/WebKit/public:all_blink",
-
# Seems to not be compiled on Android. Otherwise it will need a config.h.
"//third_party/libxslt",
@@ -224,15 +212,12 @@
# Not tested on Android yet:
"//google_apis/gcm",
+ "//remoting/client/plugin",
+ "//storage/browser",
"//third_party/cld_2",
- "//third_party/libaddressinput",
"//third_party/ffmpeg",
- "//ui:ui_unittests",
"//ui/app_list",
"//ui/web_dialogs",
- "//ui/wm",
- "//webkit/browser:storage",
- "//webkit/child",
]
}
@@ -242,6 +227,11 @@
"//ui/ozone/demo",
]
}
-}
-}
\ No newline at end of file
+ # Non-mobile builds.
+ if (!is_android && !is_ios) {
+ deps += [
+ "//device/usb",
+ ]
+ }
+}