Commit bbb84a0f authored by Victor Costan's avatar Victor Costan Committed by Commit Bot

Revert "Roll src/third_party/leveldatabase/src/ 09a3c8e74..4a7e7f50d (11 commits)"

This reverts commit 9f9f66ee.

Reason for revert: Broke Windows build - https://build.chromium.org/p/chromium/builders/Win/builds/59636

Original change's description:
> Roll src/third_party/leveldatabase/src/ 09a3c8e74..4a7e7f50d (11 commits)
> 
> This CL also #defines DeleteFile as DeleteFileW on Windows for all
> compilation units that depend on leveldb. This definition impacts
> leveldb's API (leveldb::Env::DeleteFile), and is in effect in most of
> Chromium, because it is introduced by <windows.h>. After this CL, the
> definition is guaranteed to be in effect everywhere, so we don't have to
> reason about #include side-effects.
> 
> https://chromium.googlesource.com/external/leveldb.git/+log/09a3c8e74175..4a7e7f50dcf6
> 
> $ git log 09a3c8e74..4a7e7f50d --date=short --no-merges --format='%ad %ae %s'
> 2017-10-04 cmumford Add LEVELDB_EXPORT macro to export public symbols.
> 2017-10-04 costan leveldb: Include <algorithm> in util/env_test.cc.
> 2017-10-03 costan Fix FD leak in POSIX Env.
> 2017-10-03 costan leveldb: Add tests for CL 170769101.
> 2017-10-03 costan Remove handling for unused LRUHandle representation special case.
> 2017-10-02 sanjay Fix file writing bug in CL 170738066.
> 2017-10-02 cmumford Fix use of uninitialized value in LRUHandle.
> 2017-10-02 sanjay Fix issue 474: a race between the f*_unlocked() STDIO calls in env_posix.cc and concurrent application calls to fflush(NULL).
> 2017-09-26 costan Use portable CRC32C from google/crc32c.
> 2017-09-01 costan Remove confusing and unnecessary if.
> 2017-09-01 costan Simplify Table::Open() flow and remove a delete call.
> 
> 
> Created with:
>   roll-dep src/third_party/leveldatabase/src
> 
> Bug: 
> Change-Id: I0096e6b863616d14c20994d6cb9696ebc263f138
> Reviewed-on: https://chromium-review.googlesource.com/699018
> Reviewed-by: Chris Mumford <cmumford@chromium.org>
> Commit-Queue: Victor Costan <pwnall@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#506815}

TBR=cmumford@chromium.org,pwnall@chromium.org

Change-Id: Ifb074413f4f02289cee7c2535fde1ed516da9ad6
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://chromium-review.googlesource.com/703316Reviewed-by: default avatarVictor Costan <pwnall@chromium.org>
Commit-Queue: Victor Costan <pwnall@chromium.org>
Cr-Commit-Position: refs/heads/master@{#506827}
parent 0c4fa0d9
......@@ -371,7 +371,7 @@ deps = {
},
'src/third_party/leveldatabase/src':
Var('chromium_git') + '/external/leveldb.git' + '@' + '4a7e7f50dcf661cfffe71737650b0fb18e195d18',
Var('chromium_git') + '/external/leveldb.git' + '@' + '09a3c8e7417547829b94bcdaa62cdf9e896f29a9',
'src/third_party/libFuzzer/src':
Var('chromium_git') + '/chromium/llvm-project/compiler-rt/lib/fuzzer.git' + '@' + Var('libfuzzer_revision'),
......
......@@ -12,17 +12,6 @@ config("leveldatabase_config") {
"src",
"src/include",
]
if (is_win) {
# windows.h #defines DeleteFile to DeleteFileW on Unicode builds. This
# definition is in effect in a large part of Chromium's compilation units.
# leveldb::Env has a DeleteFile method, which becomes DeleteFileW when the
# definition is in effect.
#
# Define the macro everywhere, to avoid reasoning about which headers bring
# windows.h in.
defines += [ "DeleteFile=DeleteFileW" ]
}
}
static_library("leveldatabase") {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment