got the whole thing building and linking without commenting out functions

Author: eighthave

jni/Android.mk

@@ -46,8 +46,12 @@ LOCAL_SHARED_LIBRARIES := \
 
 LOCAL_CFLAGS += -U__APPLE__
 LOCAL_LDFLAGS += -L../obj/local/armeabi/
-# libnativehelper is included with Android but not the NDK
-LOCAL_LDLIBS += -ldl -llog -lnativehelper -lsqlcipher
+# libs from the NDK
+LOCAL_LDLIBS += -ldl -llog
+# libnativehelper and libandroid_runtime are included with Android but not the NDK
+LOCAL_LDLIBS += -lnativehelper -landroid_runtime
+# these are build in the ../external section
+LOCAL_LDLIBS += -lsqlcipher -lsqlcipher_android
 
 ifeq ($(WITH_MALLOC_LEAK_CHECK),true)
 	LOCAL_CFLAGS += -DMALLOC_LEAK_CHECK

jni/info_guardianproject_database_sqlcipher_SQLiteCompiledSql.cpp

@@ -127,8 +127,8 @@ int register_android_database_SQLiteCompiledSql(JNIEnv * env)
         return -1;
     }
 
-//    return AndroidRuntime::registerNativeMethods(env,
-//        "android/database/sqlite/SQLiteCompiledSql", sMethods, NELEM(sMethods));
+    return android::AndroidRuntime::registerNativeMethods(env,
+        "info/guardianproject/database/sqlcipher/SQLiteCompiledSql", sMethods, NELEM(sMethods));
 }
 
 } // namespace guardianproject

jni/info_guardianproject_database_sqlcipher_SQLiteDatabase.cpp

@@ -22,8 +22,8 @@
 #include <utils/String16.h>
 
 #include <jni.h>
-//#include <JNIHelp.h>
-//#include <android_runtime/AndroidRuntime.h>
+#include <JNIHelp.h>
+#include <android_runtime/AndroidRuntime.h>
 
 #include <sqlite3.h>
 #include <sqlite3_android.h>
@@ -474,7 +474,7 @@ int register_android_database_SQLiteDatabase(JNIEnv *env)
         return -1;
     }
 
-//    return AndroidRuntime::registerNativeMethods(env, "android/database/sqlite/SQLiteDatabase", sMethods, NELEM(sMethods));
+    return android::AndroidRuntime::registerNativeMethods(env, "info/guardianproject/database/sqlcipher/SQLiteDatabase", sMethods, NELEM(sMethods));
 }
 
 /* throw a SQLiteException with a message appropriate for the error in handle */

jni/info_guardianproject_database_sqlcipher_SQLiteProgram.cpp

@@ -189,8 +189,8 @@ int register_android_database_SQLiteProgram(JNIEnv * env)
         return -1;
     }
 
-    return AndroidRuntime::registerNativeMethods(env,
-        "android/database/sqlite/SQLiteProgram", sMethods, NELEM(sMethods));
+    return android::AndroidRuntime::registerNativeMethods(env,
+        "info/guardianproject/database/sqlcipher/SQLiteProgram", sMethods, NELEM(sMethods));
 }
 */
 

jni/info_guardianproject_database_sqlcipher_SQLiteQuery.cpp

@@ -362,8 +362,8 @@ int register_android_database_SQLiteQuery(JNIEnv * env)
         return -1;
     }
 
-    return AndroidRuntime::registerNativeMethods(env,
-        "android/database/sqlite/SQLiteQuery", sMethods, NELEM(sMethods));
+    return android::AndroidRuntime::registerNativeMethods(env,
+        "info/guardianproject/database/sqlcipher/SQLiteQuery", sMethods, NELEM(sMethods));
 }
 */
 

jni/info_guardianproject_database_sqlcipher_SQLiteStatement.cpp

@@ -143,8 +143,8 @@ int register_android_database_SQLiteStatement(JNIEnv * env)
         return -1;
     }
 
-    return AndroidRuntime::registerNativeMethods(env,
-        "android/database/sqlite/SQLiteStatement", sMethods, NELEM(sMethods));
+    return android::AndroidRuntime::registerNativeMethods(env,
+        "info/guardianproject/database/sqlcipher/SQLiteStatement", sMethods, NELEM(sMethods));
 }
 */
 

jni/sqlite3_exception.h

@@ -20,7 +20,7 @@
 
 #include <jni.h>
 #include <JNIHelp.h>
-//#include <android_runtime/AndroidRuntime.h>
+#include <android_runtime/AndroidRuntime.h>
 
 #include <sqlite3.h>