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

Unified Diff: third_party/flatbuffers/flatbuffers.gyp

Issue 2086213003: Data structures for Safe Browsing subresource filtering rules. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Data structures for Subresource Filter. Created 4 years, 6 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 | « third_party/flatbuffers/BUILD.gn ('k') | third_party/flatbuffers/flatc.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/flatbuffers/flatbuffers.gyp
diff --git a/third_party/flatbuffers/flatbuffers.gyp b/third_party/flatbuffers/flatbuffers.gyp
index 61f79fb7e8faa786802a73310e52fbb6c3986f4a..24e098376420d69cfb6ef58b0fc6c5e6321b299c 100644
--- a/third_party/flatbuffers/flatbuffers.gyp
+++ b/third_party/flatbuffers/flatbuffers.gyp
@@ -7,6 +7,7 @@
{
'target_name': 'compiler_files',
'type': 'static_library',
+ 'toolsets': ['host'],
'include_dirs': [
'src/include',
],
@@ -29,7 +30,8 @@
},
{
'target_name': 'flatbuffers',
- 'type': 'static_library',
+ 'type': 'none',
+ 'toolsets': ['host', 'target'],
'include_dirs': [
'src/include',
],
@@ -46,6 +48,7 @@
{
'target_name': 'flatc',
'type': 'executable',
+ 'toolsets': ['host'],
'dependencies': [
'compiler_files',
'flatbuffers',
@@ -53,6 +56,9 @@
'sources': [
'src/src/flatc.cpp',
],
+ 'ldflags': [
+ '-pie',
+ ],
},
# The following is just for testing.
@@ -80,6 +86,7 @@
# cd third_party/flatbuffers/ && ../../out/Debug/flatbuffers_unittest
'target_name': 'flatbuffers_unittest',
'type': 'executable',
+ 'toolsets': ['host'],
'dependencies': [
'compiler_files',
'flatbuffers'
« no previous file with comments | « third_party/flatbuffers/BUILD.gn ('k') | third_party/flatbuffers/flatc.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698