Skip to content

Commit

Permalink
Update flatbuffers to HEAD of upstream
Browse files Browse the repository at this point in the history
BUG=611782

Review-Url: https://codereview.chromium.org/1992133002
Cr-Commit-Position: refs/heads/master@{#395543}
  • Loading branch information
battre authored and Commit bot committed May 24, 2016
1 parent cbf0a29 commit 1be6140
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 7 deletions.
2 changes: 1 addition & 1 deletion DEPS
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,7 @@ deps = {
Var('chromium_git') + '/chromium/deps/flac.git' + '@' + '812243a85937e06102ba312c6caf8823e243b35b',

'src/third_party/flatbuffers/src':
Var('chromium_git') + '/external/github.com/google/flatbuffers.git' + '@' + '6f751d5d26fd566f8c9060358101a2596677f9cf',
Var('chromium_git') + '/external/github.com/google/flatbuffers.git' + '@' + '0ef72db7bfd3d483726dcaeedfbd9942d3523ffa',

'src/third_party/pyftpdlib/src':
Var('chromium_git') + '/external/pyftpdlib.git' + '@' + '2be6d65e31c7ee6320d059f581f05ae8d89d7e45',
Expand Down
5 changes: 3 additions & 2 deletions third_party/flatbuffers/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,9 @@ source_set("flatbuffers") {

source_set("compiler_files") {
sources = [
"src/include/idl.h",
"src/include/util.h",
"src/include/flatbuffers/code_generators.h",
"src/include/flatbuffers/idl.h",
"src/include/flatbuffers/util.h",
"src/src/idl_gen_cpp.cpp",
"src/src/idl_gen_fbs.cpp",
"src/src/idl_gen_general.cpp",
Expand Down
4 changes: 2 additions & 2 deletions third_party/flatbuffers/README.chromium
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
Name: FlatBuffers
Short Name: flatbuffers
URL: https://github.com/google/flatbuffers
Version: 6f751d5d26fd566f8c9060358101a2596677f9cf
Date: 2016-02-20
Version: 28543408
Date: 2016-05-24
License: Apache 2.0
License File: LICENSE
Security Critical: yes
Expand Down
5 changes: 3 additions & 2 deletions third_party/flatbuffers/flatbuffers.gyp
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,9 @@
'src/src/idl_parser.cpp',
'src/src/reflection.cpp',
'src/src/util.cpp',
'src/include/idl.h',
'src/include/util.h',
'src/include/flatbuffers/code_generators.h',
'src/include/flatbuffers/idl.h',
'src/include/flatbuffers/util.h',
],
},
{
Expand Down

0 comments on commit 1be6140

Please sign in to comment.