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>

2 files changed, 30 insertions, 13 deletions

diff --git a/chromium/breakpad/breakpad.gyp b/chromium/breakpad/breakpad.gyp
index 482fcd1861a..066bf28d3e2 100644
--- a/chromium/breakpad/breakpad.gyp
+++ b/chromium/breakpad/breakpad.gyp
@@ -16,6 +16,7 @@
           'target_name': 'minidump_stackwalk',
           'type': 'executable',
           'includes': ['breakpad_tools.gypi'],
+          'defines': ['BPLOG_MINIMUM_SEVERITY=SEVERITY_ERROR'],
           'sources': [
             'src/processor/basic_code_module.h',
             'src/processor/basic_code_modules.cc',
@@ -29,6 +30,8 @@
             'src/processor/disassembler_x86.cc',
             'src/processor/disassembler_x86.h',
             'src/processor/exploitability.cc',
+            'src/processor/exploitability_linux.cc',
+            'src/processor/exploitability_linux.h',
             'src/processor/exploitability_win.cc',
             'src/processor/exploitability_win.h',
             'src/processor/logging.cc',
@@ -42,12 +45,15 @@
             'src/processor/simple_symbol_supplier.cc',
             'src/processor/simple_symbol_supplier.h',
             'src/processor/source_line_resolver_base.cc',
+            'src/processor/stack_frame_cpu.cc',
             'src/processor/stack_frame_symbolizer.cc',
             'src/processor/stackwalker.cc',
             'src/processor/stackwalker_amd64.cc',
             'src/processor/stackwalker_amd64.h',
             'src/processor/stackwalker_arm.cc',
             'src/processor/stackwalker_arm.h',
+            'src/processor/stackwalker_arm64.cc',
+            'src/processor/stackwalker_arm64.h',
             'src/processor/stackwalker_mips.cc',
             'src/processor/stackwalker_mips.h',
             'src/processor/stackwalker_ppc.cc',
@@ -504,14 +510,18 @@
                 'src/common/android/breakpad_getcontext.S',
               ],
             }],
+            ['OS!="android"', {
+              'link_settings': {
+                'libraries': [
+                  # In case of Android, '-ldl' is added in common.gypi, since it
+                  # is needed for stlport_static. For LD, the order of libraries
+                  # is important, and thus we skip to add it here.
+                  '-ldl',
+                ],
+              },
+            }],
           ],
 
-          'link_settings': {
-            'libraries': [
-              '-ldl',
-            ],
-          },
-
           'include_dirs': [
             'src',
             'src/client',
@@ -571,13 +581,13 @@
             'src/common/linux/file_id_unittest.cc',
             'src/common/linux/linux_libc_support_unittest.cc',
             'src/common/linux/synth_elf.cc',
+            'src/common/linux/tests/auto_testfile.h',
             'src/common/linux/tests/crash_generator.cc',
             'src/common/linux/tests/crash_generator.h',
             'src/common/memory_range.h',
             'src/common/memory_unittest.cc',
             'src/common/simple_string_dictionary_unittest.cc',
             'src/common/test_assembler.cc',
-            'src/common/tests/auto_testfile.h',
             'src/common/tests/file_utils.cc',
             'src/common/tests/file_utils.h',
             'src/tools/linux/md2core/minidump_memory_range.h',
@@ -621,6 +631,13 @@
             'src',
             '..',
           ],
+          'conditions': [
+            ['target_arch=="mipsel" and OS=="android"', {
+              'include_dirs': [
+                'src/common/android/include',
+              ],
+            }],
+          ],
         },
         {
           'target_name': 'generate_test_dump',
diff --git a/chromium/breakpad/src/client/windows/build/common.gypi b/chromium/breakpad/src/client/windows/build/common.gypi
index 60a24582d9f..eac64d25dbc 100644
--- a/chromium/breakpad/src/client/windows/build/common.gypi
+++ b/chromium/breakpad/src/client/windows/build/common.gypi
@@ -123,10 +123,10 @@
       # Python version.
       'python_ver%': '2.5',
 
-      # Set ARM-v7 compilation flags
-      'armv7%': 0,
+      # Determine ARM compilation flags.
+      'arm_version%': 7,
 
-      # Set Neon compilation flags (only meaningful if armv7==1).
+      # Set Neon compilation flags (only meaningful if arm_version==7).
       'arm_neon%': 1,
 
       # The system root for cross-compiles. Default: none.
@@ -148,7 +148,7 @@
     'fastbuild%': '<(fastbuild)',
     'linux_fpic%': '<(linux_fpic)',
     'python_ver%': '<(python_ver)',
-    'armv7%': '<(armv7)',
+    'arm_version%': '<(arm_version)',
     'arm_neon%': '<(arm_neon)',
     'sysroot%': '<(sysroot)',
     'disable_sse2%': '<(disable_sse2)',
@@ -254,7 +254,7 @@
     # Set Thumb compilation flags.
     'arm_thumb%': 0,
 
-    # Set ARM fpu compilation flags (only meaningful if armv7==1 and
+    # Set ARM fpu compilation flags (only meaningful if arm_version==7 and
     # arm_neon==0).
     'arm_fpu%': 'vfpv3',
 
@@ -980,7 +980,7 @@
                     '-Wa,-mimplicit-it=thumb',
                     ]
                   }],
-                  ['armv7==1', {
+                  ['arm_version==7', {
                     'cflags': [
                       '-march=armv7-a',
                       '-mtune=cortex-a8',