BASELINE: Update Chromium to 55.0.2883.105

And updates ninja to 1.7.2

Change-Id: I20d43c737f82764d857ada9a55586901b18b9243
Reviewed-by: Michael Brüning <michael.bruning@qt.io>

2 files changed, 1 insertions, 77 deletions

diff --git a/chromium/base/android/jni_generator/BUILD.gn b/chromium/base/android/jni_generator/BUILD.gn
index 1d989022497..12c0c39ff87 100644
--- a/chromium/base/android/jni_generator/BUILD.gn
+++ b/chromium/base/android/jni_generator/BUILD.gn
@@ -5,14 +5,13 @@
 import("//build/config/android/rules.gni")
 import("//testing/test.gni")
 
-# GYP: //base/android/jni_generator/jni_generator.gyp:jni_generator_py_tests
 action("jni_generator_py_tests") {
   _stamp = "$target_gen_dir/jni_generator_py_tests.stamp"
   inputs = [
     "jni_generator.py",
     "jni_generator_tests.py",
     "java/src/org/chromium/example/jni_generator/SampleForTests.java",
-    "golden_sample_for_tests_jni.h",
+    "SampleForTests_jni.golden",
   ]
   outputs = [
     _stamp,
@@ -24,7 +23,6 @@ action("jni_generator_py_tests") {
   ]
 }
 
-# GYP: //base/android/jni_generator/jni_generator.gyp:jni_sample_header
 generate_jni("jni_sample_header") {
   sources = [
     "java/src/org/chromium/example/jni_generator/SampleForTests.java",
@@ -32,7 +30,6 @@ generate_jni("jni_sample_header") {
   jni_package = "example"
 }
 
-# GYP: //base/android/jni_generator/jni_generator.gyp:jni_sample_java
 android_library("jni_sample_java") {
   java_files =
       [ "java/src/org/chromium/example/jni_generator/SampleForTests.java" ]
@@ -43,7 +40,6 @@ android_library("jni_sample_java") {
 
 # This executable doesn't actually run, but at least serves to test that
 # generated bindings compile properly.
-# GYP: //base/android/jni_generator/jni_generator.gyp:jni_generator_tests
 executable("jni_generator_tests") {
   deps = [
     ":jni_generator_py_tests",
diff --git a/chromium/base/android/jni_generator/jni_generator.gyp b/chromium/base/android/jni_generator/jni_generator.gyp
deleted file mode 100644
index ce936a0ec4c..00000000000
--- a/chromium/base/android/jni_generator/jni_generator.gyp
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright (c) 2012 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.
-
-{
-  'targets': [
-    # GYP: //base/android/jni_generator:jni_generator_tests
-    {
-      'target_name': 'jni_generator_py_tests',
-      'type': 'none',
-      'variables': {
-        'stamp': '<(INTERMEDIATE_DIR)/jni_generator_py_tests.stamp',
-      },
-      'actions': [
-        {
-          'action_name': 'run_jni_generator_py_tests',
-          'inputs': [
-            'jni_generator.py',
-            'jni_generator_tests.py',
-            'java/src/org/chromium/example/jni_generator/SampleForTests.java',
-            'golden_sample_for_tests_jni.h',
-          ],
-          'outputs': [
-            '<(stamp)',
-          ],
-          'action': [
-            'python', 'jni_generator_tests.py',
-            '--stamp=<(stamp)',
-          ],
-        },
-      ],
-    },
-    # GYP: //base/android/jni_generator:jni_sample_header
-    {
-      'target_name': 'jni_sample_header',
-      'type': 'none',
-      'sources': [
-        'java/src/org/chromium/example/jni_generator/SampleForTests.java',
-      ],
-      'variables': {
-        'jni_gen_package': 'example',
-      },
-      'includes': [ '../../../build/jni_generator.gypi' ],
-    },
-    # GYP: //base/android/jni_generator:jni_sample_java
-    {
-      'target_name': 'jni_sample_java',
-      'type': 'none',
-      'variables': {
-        'java_in_dir': '../../../base/android/jni_generator/java',
-      },
-      'dependencies': [
-        '<(DEPTH)/base/base.gyp:base_java',
-      ],
-      'includes': [ '../../../build/java.gypi' ],
-    },
-    # GYP: //base/android/jni_generator:jni_generator_tests
-    {
-      'target_name': 'jni_generator_tests',
-      'type': 'executable',
-      'dependencies': [
-        '../../base.gyp:test_support_base',
-        'jni_generator_py_tests',
-        'jni_sample_header',
-        'jni_sample_java',
-      ],
-      'sources': [
-        'sample_for_tests.cc',
-      ],
-    },
-  ],
-}