commit b7ddfbc98bf394af6b1be1a0836e6c485ea37e62
author Mark Mentovai <mark@chromium.org> Wed Sep 20 22:57:27 2017
committer Commit Bot <commit-bot@chromium.org> Wed Sep 20 22:57:27 2017
tree e153662f5ad4bccd4dd9a0fdcfa4128b9846585f
parent 08ef8c4e043e3e6fc5193511058c06b14e55a127

Update Breakpad to 6b59fc07474c9338e7727c52a6d8a92010a105ad

661fcf950728 Increase the maximum number of modules allowed in minidumps
4633b1c3186a Parse DWARF 4 line tables correctly
4440811b8c9b drop glog from the checkout
a25e83820a35 drop bundled gflags from the checkout
b9da2cd14eab android: Don’t compete with NDK API >= 21 over NDK
             structures
38f9f10c4d33 Fix googletest/googlemock build
ea8a17cbf52e Replace remaining references to 'struct ucontext' with
             'ucontext_t'
6b59fc07474c Restore missing #include <stdint.h> to Android <sys/user.h>

Change-Id: I6a4584d69c4094d2e646b00b313fe34def3f8cf7
Reviewed-on: https://chromium-review.googlesource.com/675729
Reviewed-by: Mike Frysinger <vapier@chromium.org>
Commit-Queue: Mark Mentovai <mark@chromium.org>
Cr-Original-Commit-Position: refs/heads/master@{#503277}
Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src
Cr-Mirrored-Commit: 3c2f71a31210de6f99a31217e5ae68a373f631d0

BUILD.gn

diff --git a/BUILD.gn b/BUILD.gn
index 8763b20..fb2aeea 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -6,10 +6,6 @@
 import("//testing/libfuzzer/fuzzer_test.gni")
 import("//testing/test.gni")
 
-if (is_android) {
-  import("//build/config/android/rules.gni")
-}
-
 if (is_win) {
   import("//build/config/win/visual_studio_version.gni")
 }
@@ -42,7 +38,6 @@
 config("client_config") {
   include_dirs = [ "src" ]
   if (is_android) {
-    defines = [ "ANDROID_NDK_MAJOR_VERSION=${android_ndk_major_version}" ]
     include_dirs += [ "src/common/android/include" ]
   }
   if (is_chromeos) {