Skip to content

Git submodule #22

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Git submodule #22

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c036df3
remove leveldb
Mar 13, 2014
073e655
Added leveldb as a submodule at top
Mar 13, 2014
fe0da57
Leveldb builds with NDK now
Mar 13, 2014
c44542b
Remove mips architecture as leveldb 1.16 appears to have dropped MIPS…
jerryzhenleicai Mar 16, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[submodule "leveldb"]
path = leveldb
url = https://code.google.com/p/leveldb/
1 change: 1 addition & 0 deletions leveldb
Open in desktop
Submodule leveldb added at 269fc6
6 changes: 3 additions & 3 deletions library/jni/Android.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS)

LOCAL_MODULE := leveldbjni
LOCAL_C_INCLUDES := $(LOCAL_PATH)/leveldb-1.13.0/include
LOCAL_C_INCLUDES := $(LOCAL_PATH)/leveldb/include
LOCAL_CPP_EXTENSION := .cc
LOCAL_CFLAGS := -DLEVELDB_PLATFORM_ANDROID -std=gnu++0x
LOCAL_SRC_FILES := com_litl_leveldb_DB.cc com_litl_leveldb_Iterator.cc com_litl_leveldb_WriteBatch.cc leveldbjni.cc
Expand All @@ -16,8 +16,8 @@ include $(CLEAR_VARS)
LOCAL_MODULE := leveldb
LOCAL_CFLAGS := -D_REENTRANT -DOS_ANDROID -DLEVELDB_PLATFORM_POSIX -DNDEBUG -DSNAPPY
LOCAL_CPP_EXTENSION := .cc
LOCAL_C_INCLUDES := $(LOCAL_PATH)/leveldb-1.13.0 $(LOCAL_PATH)/leveldb-1.13.0/include $(LOCAL_PATH)/snappy-1.1.0
LOCAL_SRC_FILES := leveldb-1.13.0/db/builder.cc leveldb-1.13.0/db/c.cc leveldb-1.13.0/db/db_impl.cc leveldb-1.13.0/db/db_iter.cc leveldb-1.13.0/db/dbformat.cc leveldb-1.13.0/db/filename.cc leveldb-1.13.0/db/log_reader.cc leveldb-1.13.0/db/log_writer.cc leveldb-1.13.0/db/memtable.cc leveldb-1.13.0/db/repair.cc leveldb-1.13.0/db/table_cache.cc leveldb-1.13.0/db/version_edit.cc leveldb-1.13.0/db/version_set.cc leveldb-1.13.0/db/write_batch.cc leveldb-1.13.0/table/block.cc leveldb-1.13.0/table/block_builder.cc leveldb-1.13.0/table/filter_block.cc leveldb-1.13.0/table/format.cc leveldb-1.13.0/table/iterator.cc leveldb-1.13.0/table/merger.cc leveldb-1.13.0/table/table.cc leveldb-1.13.0/table/table_builder.cc leveldb-1.13.0/table/two_level_iterator.cc leveldb-1.13.0/util/arena.cc leveldb-1.13.0/util/bloom.cc leveldb-1.13.0/util/cache.cc leveldb-1.13.0/util/coding.cc leveldb-1.13.0/util/comparator.cc leveldb-1.13.0/util/crc32c.cc leveldb-1.13.0/util/env.cc leveldb-1.13.0/util/env_posix.cc leveldb-1.13.0/util/filter_policy.cc leveldb-1.13.0/util/hash.cc leveldb-1.13.0/util/histogram.cc leveldb-1.13.0/util/logging.cc leveldb-1.13.0/util/options.cc leveldb-1.13.0/util/status.cc leveldb-1.13.0/port/port_posix.cc
LOCAL_C_INCLUDES := $(LOCAL_PATH)/leveldb $(LOCAL_PATH)/leveldb/include $(LOCAL_PATH)/snappy-1.1.0
LOCAL_SRC_FILES := leveldb/db/builder.cc leveldb/db/c.cc leveldb/db/db_impl.cc leveldb/db/db_iter.cc leveldb/db/dbformat.cc leveldb/db/filename.cc leveldb/db/log_reader.cc leveldb/db/log_writer.cc leveldb/db/memtable.cc leveldb/db/repair.cc leveldb/db/table_cache.cc leveldb/db/version_edit.cc leveldb/db/version_set.cc leveldb/db/write_batch.cc leveldb/table/block.cc leveldb/table/block_builder.cc leveldb/table/filter_block.cc leveldb/table/format.cc leveldb/table/iterator.cc leveldb/table/merger.cc leveldb/table/table.cc leveldb/table/table_builder.cc leveldb/table/two_level_iterator.cc leveldb/util/arena.cc leveldb/util/bloom.cc leveldb/util/cache.cc leveldb/util/coding.cc leveldb/util/comparator.cc leveldb/util/crc32c.cc leveldb/util/env.cc leveldb/util/env_posix.cc leveldb/util/filter_policy.cc leveldb/util/hash.cc leveldb/util/histogram.cc leveldb/util/logging.cc leveldb/util/options.cc leveldb/util/status.cc leveldb/port/port_posix.cc
LOCAL_STATIC_LIBRARIES += snappy

include $(BUILD_STATIC_LIBRARY)
Expand Down
2 changes: 1 addition & 1 deletion library/jni/Application.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
APP_PLATFORM=android-8
APP_ABI := armeabi armeabi-v7a mips x86
APP_ABI := armeabi armeabi-v7a x86
APP_STL := stlport_static
1 change: 1 addition & 0 deletions library/jni/leveldb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../leveldb/
9 changes: 0 additions & 9 deletions library/jni/leveldb-1.13.0/.gitignore
View file
Open in desktop

This file was deleted.

11 changes: 0 additions & 11 deletions library/jni/leveldb-1.13.0/AUTHORS
View file
Open in desktop

This file was deleted.

27 changes: 0 additions & 27 deletions library/jni/leveldb-1.13.0/LICENSE
View file
Open in desktop

This file was deleted.

214 changes: 0 additions & 214 deletions library/jni/leveldb-1.13.0/Makefile
View file
Open in desktop

This file was deleted.

17 changes: 0 additions & 17 deletions library/jni/leveldb-1.13.0/NEWS
View file
Open in desktop

This file was deleted.

51 changes: 0 additions & 51 deletions library/jni/leveldb-1.13.0/README
View file
Open in desktop

This file was deleted.

14 changes: 0 additions & 14 deletions library/jni/leveldb-1.13.0/TODO
View file
Open in desktop

This file was deleted.

Loading