Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3610)

Unified Diff: breakpad/breakpad.gyp

Issue 1870833004: Roll breakpad 9992f5d9d..06029285343afc (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Remove default android build-id flag in gyp Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « breakpad/BUILD.gn ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: breakpad/breakpad.gyp
diff --git a/breakpad/breakpad.gyp b/breakpad/breakpad.gyp
index 5483ca026dd635dbbb9d828532db681ed135b383..b77bc7a0f27a541d367dc6ebbaa48b6c3c885959 100644
--- a/breakpad/breakpad.gyp
+++ b/breakpad/breakpad.gyp
@@ -432,6 +432,8 @@
'src/tools/linux/symupload/sym_upload.cc',
'src/common/linux/http_upload.cc',
'src/common/linux/http_upload.h',
+ 'src/common/linux/symbol_upload.cc',
+ 'src/common/linux/symbol_upload.h',
],
'include_dirs': [
'src',
@@ -688,6 +690,11 @@
'src/tools/linux/md2core/minidump_memory_range_unittest.cc',
],
+ # The build-id is required to test the minidump writer.
+ 'ldflags': [
+ "-Wl,--build-id=0x000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f",
+ ],
+
'include_dirs': [
'linux', # Use our copy of breakpad_googletest_includes.h
'src',
@@ -711,6 +718,10 @@
'isolate_file': 'breakpad_unittests.isolate',
},
'includes': [ '../build/android/test_runner.gypi' ],
+ 'ldflags!': [
+ # We are overriding the build-id above so remove the default.
+ '-Wl,--build-id=sha1',
+ ],
}],
['clang==1 and target_arch=="ia32"', {
'cflags!': [
« no previous file with comments | « breakpad/BUILD.gn ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698