Merge branch 'v2'

Conflicts:
	.gitmodules

Author: developernotes

.gitmodules

@@ -3,7 +3,7 @@
 	url = git://github.com/guardianproject/openssl-android.git
 [submodule "external/sqlcipher"]
 	path = external/sqlcipher
-	url = git://github.com/guardianproject/sqlcipher-android.git
+	url = git://github.com/sqlcipher/sqlcipher.git
 [submodule "external/dalvik"]
 	path = external/dalvik
 	url = git://github.com/android/platform_dalvik.git

AndroidManifest.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-	package="info.guardianproject.database" android:versionCode="4"
+	package="net.sqlcipher" android:versionCode="4"
 	android:versionName="v1 (0.0.6.FINAL)">
 	<uses-sdk android:minSdkVersion="7"></uses-sdk>
 	<application android:icon="@drawable/icon" android:label="@string/app_name">

Makefile

@@ -1,6 +1,9 @@
 
 .DEFAULT_GOAL := all
 LIBRARY_ROOT := libs
+JNI_DIR := ${CURDIR}/jni
+EXTERNAL_DIR := ${CURDIR}/external
+SQLCIPHER_DIR := ${EXTERNAL_DIR}/sqlcipher
 
 init:
 	git submodule update --init
@@ -9,35 +12,36 @@ init:
 all: build-external build-jni build-java copy-libs
 
 build-external:
-	cd external/ && \
+	cd ${EXTERNAL_DIR} && \
 	make -f Android.mk build-local-hack && \
 	ndk-build && \
 	make -f Android.mk copy-libs-hack
 
 build-jni:
-	cd jni/ && \
+	cd ${JNI_DIR} && \
 	ndk-build
 
 build-java:
 	ant release && \
-	cd bin/classes && \
+	cd ${CURDIR}/bin/classes && \
 	jar -cvf sqlcipher.jar .
 
 clean:
 	ant clean
-	cd external/ && ndk-build clean 
-	cd jni/ && ndk-build clean 
+	cd ${EXTERNAL_DIR} && ndk-build clean
+	-cd ${SQLCIPHER_DIR} && make clean
+	cd ${JNI_DIR} && ndk-build clean 
 	-rm ${LIBRARY_ROOT}/armeabi/libsqlcipher_android.so
 	-rm ${LIBRARY_ROOT}/armeabi/libdatabase_sqlcipher.so
 	-rm ${LIBRARY_ROOT}/sqlcipher.jar
 
 copy-libs:
 	mkdir -p ${LIBRARY_ROOT}/armeabi
-	cp external/libs/armeabi/libsqlcipher_android.so \
+	cp ${EXTERNAL_DIR}/libs/armeabi/libsqlcipher_android.so \
 		 ${LIBRARY_ROOT}/armeabi  && \
-	cp jni/libs/armeabi/libdatabase_sqlcipher.so \
+	cp ${JNI_DIR}/libs/armeabi/libdatabase_sqlcipher.so \
 		${LIBRARY_ROOT}/armeabi && \
-	cp bin/classes/sqlcipher.jar ${LIBRARY_ROOT} && \
+	cp ${CURDIR}/bin/classes/sqlcipher.jar ${LIBRARY_ROOT} && \
 	cp ${ANDROID_NDK_ROOT}/sources/cxx-stl/stlport/libs/armeabi/libstlport_shared.so \
 		 ${LIBRARY_ROOT}/armeabi
 

external/Android.mk

@@ -10,21 +10,13 @@ LOCAL_PATH := $(PROJECT_ROOT_PATH)
 LOCAL_PRELINK_MODULE := false
 
 # how on earth to you make this damn Android build system run cmd line progs?!?!
-build-local-hack: sqlcipher/sqlite3.c ../obj/local/armeabi/libcrypto.so
+build-local-hack: sqlcipher/sqlite3.c
 
 sqlcipher/sqlite3.c:
-	cd sqlcipher && ./configure --enable-tempstore=yes CFLAGS="-DSQL_HAS_CODEC" LDFLAGS="-lcrypto"
+	cd ${CURDIR}/sqlcipher && ./configure
 	make -C sqlcipher sqlite3.c
 
-# TODO include this Android.mk to integrate this into the build
-../obj/local/armeabi/libcrypto.so:
-	cd openssl && ndk-build -j4
-	mkdir -p ../obj/local/armeabi
-	install -p openssl/libs/armeabi/libcrypto.so openssl/libs/armeabi/libssl.so \
-		 ../obj/local/armeabi/
-
 copy-libs-hack: build-local-hack
-	install -p -m644 openssl/libs/armeabi/*.so ../obj/local/armeabi/
 	install -p -m644 libs/armeabi/*.so ../obj/local/armeabi/
 
 project_ldflags:= -Llibs/armeabi/ -Landroid-libs/
@@ -36,7 +28,7 @@ project_ldflags:= -Llibs/armeabi/ -Landroid-libs/
 #   SQLITE_TEMP_STORE=3 causes all TEMP files to go into RAM. and thats the behavior we want
 #   SQLITE_ENABLE_FTS3   enables usage of FTS3 - NOT FTS1 or 2.
 #   SQLITE_DEFAULT_AUTOVACUUM=1  causes the databases to be subject to auto-vacuum
-android_sqlite_cflags :=  -DHAVE_USLEEP=1 -DSQLITE_DEFAULT_JOURNAL_SIZE_LIMIT=1048576 -DSQLITE_THREADSAFE=1 -DNDEBUG=1 -DSQLITE_ENABLE_MEMORY_MANAGEMENT=1 -DSQLITE_DEFAULT_AUTOVACUUM=1 -DSQLITE_TEMP_STORE=3 -DSQLITE_ENABLE_FTS3 -DSQLITE_ENABLE_FTS3_BACKWARDS -DSQLITE_ENABLE_LOAD_EXTENSION
+android_sqlite_cflags :=  -DHAVE_USLEEP=1 -DSQLITE_DEFAULT_JOURNAL_SIZE_LIMIT=1048576 -DSQLITE_THREADSAFE=1 -DNDEBUG=1 -DSQLITE_ENABLE_MEMORY_MANAGEMENT=1 -DSQLITE_DEFAULT_AUTOVACUUM=1 -DSQLITE_TEMP_STORE=3 -DSQLITE_ENABLE_FTS3 -DSQLITE_ENABLE_FTS3_BACKWARDS -DSQLITE_ENABLE_LOAD_EXTENSION -DCODEC_DEBUG
 
 sqlcipher_files := \
 	sqlcipher/sqlite3.c

external/sqlcipher

@@ -21,14 +21,14 @@ endif
 include $(CLEAR_VARS)
 
 LOCAL_SRC_FILES:= \
-	info_guardianproject_database_sqlcipher_SQLiteCompiledSql.cpp \
-	info_guardianproject_database_sqlcipher_SQLiteDatabase.cpp \
-	info_guardianproject_database_sqlcipher_SQLiteProgram.cpp \
-	info_guardianproject_database_sqlcipher_SQLiteQuery.cpp \
-	info_guardianproject_database_sqlcipher_SQLiteStatement.cpp \
-	info_guardianproject_database_CursorWindow.cpp \
+	net_sqlcipher_database_SQLiteCompiledSql.cpp \
+	net_sqlcipher_database_SQLiteDatabase.cpp \
+	net_sqlcipher_database_SQLiteProgram.cpp \
+	net_sqlcipher_database_SQLiteQuery.cpp \
+	net_sqlcipher_database_SQLiteStatement.cpp \
+	net_sqlcipher_CursorWindow.cpp \
 	CursorWindow.cpp
-#	info_guardianproject_database_sqlcipher_SQLiteDebug.cpp
+#	net_sqlcipher_database_sqlcipher_SQLiteDebug.cpp
 
 LOCAL_C_INCLUDES += \
 	$(JNI_H_INCLUDE) \

jni/Android.mk

@@ -31,7 +31,7 @@
 #include "CursorWindow.h"
 
 
-namespace guardianproject {
+namespace sqlcipher {
 
 CursorWindow::CursorWindow(size_t maxSize) :
     mMaxSize(maxSize)
@@ -410,4 +410,4 @@ bool CursorWindow::getNull(unsigned int row, unsigned int col, bool * valueOut)
     return true;
 }
 
-}; // namespace guardianproject
+}; // namespace sqlcipher

jni/CursorWindow.cpp

@@ -62,7 +62,7 @@
 // When defined to true numberic values are stored inline in the field_slot_t, otherwise they're allocated in the window
 #define WINDOW_STORAGE_INLINE_NUMERICS 1
 
-namespace guardianproject {
+namespace sqlcipher {
 
 typedef struct
 {
@@ -203,6 +203,6 @@ class CursorWindow
     uint32_t mFreeOffset;
 };
 
-}; // namespace guardianproject
+}; // namespace sqlcipher
 
 #endif

jni/CursorWindow.h

@@ -31,7 +31,7 @@
 #include "sqlite3_exception.h"
 #include "android_util_Binder.h"
 
-namespace guardianproject {
+namespace sqlcipher {
 
 static jfieldID gWindowField;
 static jfieldID gBufferField;
@@ -683,9 +683,9 @@ int register_android_database_CursorWindow(JNIEnv * env)
 {
     jclass clazz;
 
-    clazz = env->FindClass("info/guardianproject/database/CursorWindow");
+    clazz = env->FindClass("net/sqlcipher/CursorWindow");
     if (clazz == NULL) {
-        LOGE("Can't find info/guardianproject/database/CursorWindow");
+        LOGE("Can't find net/sqlcipher/CursorWindow");
         return -1;
     }
 
@@ -716,8 +716,8 @@ int register_android_database_CursorWindow(JNIEnv * env)
         return -1;
     }
 
-    return android::AndroidRuntime::registerNativeMethods(env, "info/guardianproject/database/CursorWindow",
+    return android::AndroidRuntime::registerNativeMethods(env, "net/sqlcipher/CursorWindow",
             sMethods, NELEM(sMethods));
 }
 
-} // namespace guardianproject
+} // namespace sqlcipher

jni/info_guardianproject_database_CursorWindow.cpp renamed to jni/net_sqlcipher_CursorWindow.cpp

@@ -32,7 +32,7 @@
 #include "sqlite3_exception.h"
 
 
-namespace guardianproject {
+namespace sqlcipher {
 
 static jfieldID gHandleField;
 static jfieldID gStatementField;
@@ -113,9 +113,9 @@ int register_android_database_SQLiteCompiledSql(JNIEnv * env)
 {
     jclass clazz;
 
-    clazz = env->FindClass("info/guardianproject/database/sqlcipher/SQLiteCompiledSql");
+    clazz = env->FindClass("net/sqlcipher/database/SQLiteCompiledSql");
     if (clazz == NULL) {
-        LOGE("Can't find info/guardianproject/database/sqlcipher/SQLiteCompiledSql");
+        LOGE("Can't find net/sqlcipher/database/SQLiteCompiledSql");
         return -1;
     }
 
@@ -128,10 +128,10 @@ int register_android_database_SQLiteCompiledSql(JNIEnv * env)
     }
 
     return android::AndroidRuntime::registerNativeMethods(env,
-        "info/guardianproject/database/sqlcipher/SQLiteCompiledSql", sMethods, NELEM(sMethods));
+        "net/sqlcipher/database/SQLiteCompiledSql", sMethods, NELEM(sMethods));
 }
 
 
 
 
-} // namespace guardianproject
+} // namespace sqlcipher