8000 Merge branch 'master' into improve_jni_loading · dw3/android-database-sqlcipher@ddcd8af · GitHub
[go: up one dir, main page]
Skip to content

Commit ddcd8af

Browse files
TapchicomaTapchicoma
committed
Merge branch 'master' into improve_jni_loading
2 parents d1e4d8b + 541479e commit ddcd8af

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

79 files changed

+883
-6044
lines changed

‎.classpath

Lines changed: 0 additions & 9 deletions
This file was deleted.

‎.gitignore

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,11 @@
1-
TAGS
2-
external/libs
3-
jni/libs
4-
obj/
51
.DS_Store
6-
local.properties
72
build.xml
8-
proguard.cfg
9-
bin/
10-
gen/
11-
external/openssl
12-
external/sqlcipher
13-
libs/
3+
proguard-project.txt
4+
local.properties
5+
external/android-libs
6+
obj
7+
jni/libs
8+
bin
9+
libs
10+
gen
1411
*.zip

‎.gitmodules

Lines changed: 3 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,6 @@
1-
[submodule "external/openssl"]
2-
path = external/openssl
3-
url = https://github.com/openssl/openssl.git
41
[submodule "external/sqlcipher"]
52
path = external/sqlcipher
63
url = https://github.com/sqlcipher/sqlcipher.git
7-
[submodule "external/dalvik"]
8-
path = external/dalvik
9-
url = https://github.com/android/platform_dalvik.git
10-
[submodule "external/android-sqlite"]
11-
path = external/android-sqlite
12-
url = https://github.com/android/platform_external_sqlite.git
13-
[submodule "external/platform-system-core"]
14-
path = external/platform-system-core
15-
url = https://github.com/android/platform_system_core.git
16-
[submodule "external/platform-frameworks-base"]
17-
path = external/platform-frameworks-base
18-
url = https://github.com/android/platform_frameworks_base.git
19-
[submodule "external/icu4c"]
20-
path = external/icu4c
21-
url = https://github.com/android/platform_external_icu4c.git
4+
[submodule "external/openssl"]
5+
path = external/openssl
6+
url = https://github.com/openssl/openssl.git

‎.project

Lines changed: 0 additions & 33 deletions
This file was deleted.

‎AUTHORS

Lines changed: 0 additions & 8 deletions
This file was deleted.

‎ICU_LICENSE

Lines changed: 0 additions & 13 deletions
This file was deleted.

‎LICENSE

Lines changed: 0 additions & 202 deletions
This file was deleted.

0 commit comments

Comments
 (0)
0