summaryrefslogtreecommitdiffstats
path: root/third_party/leveldatabase/leveldatabase.gyp
diff options
context:
space:
mode:
authorhans@chromium.org <hans@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-09-26 18:24:44 +0000
committerhans@chromium.org <hans@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-09-26 18:24:44 +0000
commit5af129a22b949932f6d856e833b321db916968fe (patch)
tree2bbdab6e90c6650fc41b18911544a74ab069ae79 /third_party/leveldatabase/leveldatabase.gyp
parent903df4eaff63b4d1bd88e557ca2afd122c521d37 (diff)
downloadchromium_src-5af129a22b949932f6d856e833b321db916968fe.zip
chromium_src-5af129a22b949932f6d856e833b321db916968fe.tar.gz
chromium_src-5af129a22b949932f6d856e833b321db916968fe.tar.bz2
Roll LevelDB 47:51, add memenv to gypi.
This picks up some minor fixes and adds support for in-memory databases. BUG=92051 TEST=everything builds, current tests pass Review URL: http://codereview.chromium.org/8037024 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@102759 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party/leveldatabase/leveldatabase.gyp')
-rw-r--r--third_party/leveldatabase/leveldatabase.gyp3
1 files changed, 3 insertions, 0 deletions
diff --git a/third_party/leveldatabase/leveldatabase.gyp b/third_party/leveldatabase/leveldatabase.gyp
index 71297dd..cde2309 100644
--- a/third_party/leveldatabase/leveldatabase.gyp
+++ b/third_party/leveldatabase/leveldatabase.gyp
@@ -48,6 +48,7 @@
'direct_dependent_settings': {
'include_dirs': [
'src/include/',
+ 'src/',
],
'conditions': [
['OS == "win"', {
@@ -91,6 +92,8 @@
'src/db/version_set.h',
'src/db/write_batch.cc',
'src/db/write_batch_internal.h',
+ 'src/helpers/memenv/memenv.cc',
+ 'src/helpers/memenv/memenv.h',
'src/include/leveldb/cache.h',
'src/include/leveldb/comparator.h',
'src/include/leveldb/db.h',