Update to new stable branch 1750

This also includes an updated ninja and chromium dependencies
needed on Windows.

Change-Id: Icd597d80ed3fa4425933c9f1334c3c2e31291c42
Reviewed-by: Zoltan Arvai <zarvai@inf.u-szeged.hu>
Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>

1 files changed, 50 insertions, 17 deletions

diff --git a/chromium/build/all_android.gyp b/chromium/build/all_android.gyp
index de6341fa2e9..748571a832f 100644
--- a/chromium/build/all_android.gyp
+++ b/chromium/build/all_android.gyp
@@ -17,7 +17,8 @@
       'target_name': 'All',
       'type': 'none',
       'dependencies': [
-        '../content/content.gyp:content_shell_apk',
+        '../content/content_shell_and_tests.gyp:content_shell_apk',
+        '../mojo/mojo.gyp:mojo_shell_apk',
         '<@(android_app_targets)',
         'android_builder_tests',
         '../android_webview/android_webview.gyp:android_webview_apk',
@@ -30,11 +31,22 @@
       ],
     }, # target_name: All
     {
-      'target_name': 'all_webkit',
+      'target_name': 'blink_tests',
       'type': 'none',
       'dependencies': [
         '../third_party/WebKit/public/all.gyp:all_blink',
-        '../content/content.gyp:content_shell_apk',
+        '../content/content_shell_and_tests.gyp:content_shell_apk',
+        '../breakpad/breakpad.gyp:dump_syms#host',
+        '../breakpad/breakpad.gyp:minidump_stackwalk#host',
+      ],
+    }, # target_name: blink_tests
+    {
+      # TODO(jochen): Eventually remove this target after everybody and the
+      # bots started to use blink_tests only.
+      'target_name': 'all_webkit',
+      'type': 'none',
+      'dependencies':   [
+        'blink_tests',
       ],
     }, # target_name: all_webkit
     {
@@ -63,14 +75,15 @@
         '../cc/cc_tests.gyp:cc_perftests_apk',
         '../cc/cc_tests.gyp:cc_unittests',
         '../chrome/chrome.gyp:unit_tests',
-        '../components/components.gyp:components_unittests',
-        '../content/content.gyp:content_browsertests',
-        '../content/content.gyp:content_gl_tests',
-        '../content/content.gyp:content_shell_test_apk',
-        '../content/content.gyp:content_unittests',
+        '../components/components_tests.gyp:components_unittests',
+        '../content/content_shell_and_tests.gyp:content_browsertests',
+        '../content/content_shell_and_tests.gyp:content_gl_tests',
+        '../content/content_shell_and_tests.gyp:content_shell_test_apk',
+        '../content/content_shell_and_tests.gyp:content_unittests',
         '../gpu/gpu.gyp:gl_tests',
         '../gpu/gpu.gyp:gpu_unittests',
         '../ipc/ipc.gyp:ipc_tests',
+        '../media/media.gyp:media_perftests_apk',
         '../media/media.gyp:media_unittests',
         '../net/net.gyp:net_unittests',
         '../sandbox/sandbox.gyp:sandbox_linux_unittests',
@@ -78,9 +91,9 @@
         '../sync/sync.gyp:sync_unit_tests',
         '../third_party/WebKit/public/all.gyp:*',
         '../tools/android/android_tools.gyp:android_tools',
-        '../tools/android/device_stats_monitor/device_stats_monitor.gyp:device_stats_monitor',
+        '../tools/android/android_tools.gyp:memconsumer',
         '../tools/android/findbugs_plugin/findbugs_plugin.gyp:findbugs_plugin_test',
-        '../ui/ui.gyp:ui_unittests',
+        '../ui/ui_unittests.gyp:ui_unittests',
         # Required by ui_unittests.
         # TODO(wangxianzhu): It'd better let ui_unittests depend on it, but
         # this would cause circular gyp dependency which needs refactoring the
@@ -95,11 +108,11 @@
             '../base/base.gyp:base_unittests_apk',
             '../cc/cc_tests.gyp:cc_unittests_apk',
             '../chrome/chrome.gyp:unit_tests_apk',
-            '../components/components.gyp:components_unittests_apk',
-            '../content/content.gyp:content_browsertests_apk',
-            '../content/content.gyp:content_gl_tests_apk',
-            '../content/content.gyp:content_unittests_apk',
-            '../content/content.gyp:video_decode_accelerator_unittest_apk',
+            '../components/components_tests.gyp:components_unittests_apk',
+            '../content/content_shell_and_tests.gyp:content_browsertests_apk',
+            '../content/content_shell_and_tests.gyp:content_gl_tests_apk',
+            '../content/content_shell_and_tests.gyp:content_unittests_apk',
+            '../content/content_shell_and_tests.gyp:video_decode_accelerator_unittest_apk',
             '../gpu/gpu.gyp:gl_tests_apk',
             '../gpu/gpu.gyp:gpu_unittests_apk',
             '../ipc/ipc.gyp:ipc_tests_apk',
@@ -108,7 +121,7 @@
             '../sandbox/sandbox.gyp:sandbox_linux_jni_unittests_apk',
             '../sql/sql.gyp:sql_unittests_apk',
             '../sync/sync.gyp:sync_unit_tests_apk',
-            '../ui/ui.gyp:ui_unittests_apk',
+            '../ui/ui_unittests.gyp:ui_unittests_apk',
             '../android_webview/android_webview.gyp:android_webview_test_apk',
             '../chrome/chrome.gyp:chromium_testshell_test_apk',
             '../chrome/chrome.gyp:chromium_testshell_uiautomator_tests',
@@ -122,7 +135,9 @@
       'target_name': 'android_builder_webrtc',
       'type': 'none',
       'variables': {
-        # WebRTC tests are normally not built by Chromium bots.
+        # Set default value for include_tests to '0'. It is normally only
+        # used in WebRTC GYP files. It is set to '1' only when building
+        # WebRTC for Android, inside a Chromium checkout.
         'include_tests%': 0,
       },
       'conditions': [
@@ -134,6 +149,24 @@
       ],
     },  # target_name: android_builder_webrtc
     {
+      # WebRTC Chromium tests to run on Android.
+      'target_name': 'android_builder_chromium_webrtc',
+      'type': 'none',
+      'dependencies': [
+        '../content/content_shell_and_tests.gyp:content_browsertests',
+        '../tools/android/android_tools.gyp:android_tools',
+        '../tools/android/android_tools.gyp:memconsumer',
+      ],
+      'conditions': [
+        ['"<(gtest_target_type)"=="shared_library"', {
+          'dependencies': [
+            # Unit test bundles packaged as an apk.
+            '../content/content_shell_and_tests.gyp:content_browsertests_apk',
+          ],
+        }],
+      ],
+    },  # target_name: android_builder_chromium_webrtc
+    {
       # Experimental / in-progress targets that are expected to fail
       # but we still try to compile them on bots (turning the stage
       # orange, not red).