Added compiled external libraries (not everything is there - some mips64 libs are missing - compiled from master branch - will update the external library pointers accordingly)

Modifeid Makefiles to get 64-bit architectures - all64 not used yet

Modified Java code to use longs for the variables which store pointers, rather than int
Modifed C++ code to use longs rather than ints for pointers shared between java

Author: gmetaxas

AndroidManifest.xml

@@ -2,7 +2,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
 	package="net.sqlcipher" android:versionCode="4"
 	android:versionName="v1 (0.0.6.FINAL)">
-	<uses-sdk android:minSdkVersion="7"></uses-sdk>
+	<uses-sdk android:minSdkVersion="L"></uses-sdk>
 	<application android:icon="@drawable/icon" android:label="@string/app_name">
 
 		<activity android:name="example.SQLDemoActivity">

Makefile

@@ -74,43 +74,44 @@ clean:
 	-cd ${EXTERNAL_DIR} && ndk-build clean NDK_LIBS_OUT=$(EXTERNAL_DIR)/libs
 	-cd ${SQLCIPHER_DIR} && make clean
 	-cd ${JNI_DIR} && ndk-build clean NDK_LIBS_OUT=$(JNI_DIR)/libs
-	-rm ${LIBRARY_ROOT}/armeabi/libsqlcipher_android.so
-	-rm ${LIBRARY_ROOT}/armeabi/libdatabase_sqlcipher.so
-	-rm ${LIBRARY_ROOT}/armeabi/libstlport_shared.so
+	-rm ${LIBRARY_ROOT}/arm64_v8a/libsqlcipher_android.so
+	-rm ${LIBRARY_ROOT}/arm64_v8a/libdatabase_sqlcipher.so
+	-rm ${LIBRARY_ROOT}/arm64_v8a/libstlport_shared.so
 	-rm ${LIBRARY_ROOT}/sqlcipher.jar
-	-rm ${LIBRARY_ROOT}/x86/libsqlcipher_android.so
-	-rm ${LIBRARY_ROOT}/x86/libdatabase_sqlcipher.so
-	-rm ${LIBRARY_ROOT}/x86/libstlport_shared.so
-	-rm ${LIBRARY_ROOT}/armeabi-v7a/libsqlcipher_android.so
-	-rm ${LIBRARY_ROOT}/armeabi-v7a/libdatabase_sqlcipher.so
-	-rm ${LIBRARY_ROOT}/armeabi-v7a/libstlport_shared.so
+	-rm ${LIBRARY_ROOT}/x86_64/libsqlcipher_android.so
+	-rm ${LIBRARY_ROOT}/x86_64/libdatabase_sqlcipher.so
+	-rm ${LIBRARY_ROOT}/x86_64/libstlport_shared.so
+	#-rm ${LIBRARY_ROOT}/mips64/libsqlcipher_android.so
+	#-rm ${LIBRARY_ROOT}/mips64/libdatabase_sqlcipher.so
+	#-rm ${LIBRARY_ROOT}/mips64/libstlport_shared.so
+
 
 copy-libs:
-	mkdir -p ${LIBRARY_ROOT}/armeabi
-	cp ${EXTERNAL_DIR}/libs/armeabi/libsqlcipher_android.so \
-		 ${LIBRARY_ROOT}/armeabi  && \
-	cp ${JNI_DIR}/libs/armeabi/libdatabase_sqlcipher.so \
-		${LIBRARY_ROOT}/armeabi && \
-	cp ${EXTERNAL_DIR}/libs/armeabi/libstlport_shared.so \
-		 ${LIBRARY_ROOT}/armeabi
-	mkdir -p ${LIBRARY_ROOT}/x86
-	cp ${EXTERNAL_DIR}/libs/x86/libsqlcipher_android.so \
-		 ${LIBRARY_ROOT}/x86  && \
-	cp ${JNI_DIR}/libs/x86/libdatabase_sqlcipher.so \
-		${LIBRARY_ROOT}/x86 && \
-	cp ${EXTERNAL_DIR}/libs/x86/libstlport_shared.so \
-		 ${LIBRARY_ROOT}/x86
-	mkdir -p ${LIBRARY_ROOT}/armeabi-v7a
-	cp ${EXTERNAL_DIR}/libs/armeabi-v7a/libsqlcipher_android.so \
-		 ${LIBRARY_ROOT}/armeabi-v7a  && \
-	cp ${JNI_DIR}/libs/armeabi-v7a/libdatabase_sqlcipher.so \
-		${LIBRARY_ROOT}/armeabi-v7a && \
-	cp ${EXTERNAL_DIR}/libs/armeabi-v7a/libstlport_shared.so \
-		 ${LIBRARY_ROOT}/armeabi-v7a
+	mkdir -p ${LIBRARY_ROOT}/arm64-v8a
+	cp ${EXTERNAL_DIR}/libs/arm64-v8a/libsqlcipher_android.so \
+		 ${LIBRARY_ROOT}/arm64-v8a  && \
+	cp ${JNI_DIR}/libs/arm64-v8a/libdatabase_sqlcipher.so \
+		${LIBRARY_ROOT}/arm64-v8a && \
+	cp ${EXTERNAL_DIR}/libs/arm64-v8a/libstlport_shared.so \
+		 ${LIBRARY_ROOT}/arm64-v8a
+	mkdir -p ${LIBRARY_ROOT}/x86_64
+	cp ${EXTERNAL_DIR}/libs/x86_64/libsqlcipher_android.so \
+		 ${LIBRARY_ROOT}/x86_64  && \
+	cp ${JNI_DIR}/libs/x86_64/libdatabase_sqlcipher.so \
+		${LIBRARY_ROOT}/x86_64 && \
+	cp ${EXTERNAL_DIR}/libs/x86_64/libstlport_shared.so \
+		 ${LIBRARY_ROOT}/x86_64
+#	mkdir -p ${LIBRARY_ROOT}/mips64
+#	cp ${EXTERNAL_DIR}/libs/mips64/libsqlcipher_android.so \
+#		 ${LIBRARY_ROOT}/mips64  && \
+#	cp ${JNI_DIR}/libs/mips64/libdatabase_sqlcipher.so \
+#		${LIBRARY_ROOT}/mips64 && \
+#	cp ${EXTERNAL_DIR}/libs/mips64/libstlport_shared.so \
+#		 ${LIBRARY_ROOT}/mips64
 
 copy-libs-dist:
 	cp ${LIBRARY_ROOT}/*.jar dist/SQLCipherForAndroid-SDK/libs/ && \
-	cp ${LIBRARY_ROOT}/armeabi/*.so dist/SQLCipherForAndroid-SDK/libs/armeabi/
+	cp ${LIBRARY_ROOT}/arm64_v8a/*.so dist/SQLCipherForAndroid-SDK/libs/arm64_v8a/
 
 build-openssl-libraries:
 	./build-openssl-libraries.sh

external/Android.mk

@@ -17,7 +17,7 @@ sqlcipher/sqlite3.c:
 	make -C sqlcipher sqlite3.c
 
 copy-libs-hack: build-local-hack
-	install -p -m644 libs/armeabi/*.so ../obj/local/armeabi/
+	install -p -m644 libs/x86_64/*.so ../obj/local/x86_64/
 
 project_ldflags:= -Llibs/$(TARGET_ARCH_ABI)/ -Landroid-libs/$(TARGET_ARCH_ABI)/
 

external/android-libs/arm64-v8a/libandroid_runtime.so

@@ -0,0 +1 @@
+!<arch>

external/android-libs/arm64-v8a/libbinder.so

@@ -0,0 +1 @@
+!<arch>

external/android-libs/arm64-v8a/libcrypto.a

@@ -1,5 +1,6 @@
 APP_PROJECT_PATH := $(shell pwd)
-APP_ABI := armeabi armeabi-v7a x86
+#APP_ABI := all64
+APP_ABI := x86_64 arm64-v8a
 APP_BUILD_SCRIPT := $(APP_PROJECT_PATH)/Android.mk
 # fixes this error when building external/android-sqlite/android/sqlite3_android.cpp
 #   icu4c/common/unicode/std_string.h:39:18: error: string: No such file or directory

external/android-libs/arm64-v8a/libcutils.so

@@ -42,6 +42,16 @@
 //#undef LOGV
 //#define LOGV(...) fprintf(stderr, __VA_ARGS__)
 
+#if !defined(__LP64__)
+#define M_OBJECT_TYPE "I"
+#define GET_M_OBJECT(obj, mobject) env->GetIntField(obj, mobject)
+#define SET_M_OBJECT(obj, mobject, val) env->SetIntField(obj, mobject, (int)val)
+#else 
+#define M_OBJECT_TYPE "J"
+#define GET_M_OBJECT(obj, mobject) env->GetLongField(obj, mobject);
+#define SET_M_OBJECT(obj, mobject, val) env->SetLongField(obj, mobject, (long long int)val)
+#endif
+
 using namespace android;
 
 // ----------------------------------------------------------------------------
@@ -465,7 +475,7 @@ jobject javaObjectForIBinder(JNIEnv* env, const sp<IBinder>& val)
     if (object != NULL) {
         LOGV("objectForBinder %p: created new %p!\n", val.get(), object);
         // The proxy holds a reference to the native object.
-        env->SetIntField(object, gBinderProxyOffsets.mObject, (int)val.get());
+        SET_M_OBJECT(object, gBinderProxyOffsets.mObject, val.get());
         val->incStrong(object);
 
         // The native object needs to hold a weak reference back to the
@@ -489,13 +499,13 @@ sp<IBinder> ibinderForJavaObject(JNIEnv* env, jobject obj)
 
     if (env->IsInstanceOf(obj, gBinderOffsets.mClass)) {
         JavaBBinderHolder* jbh = (JavaBBinderHolder*)
-            env->GetIntField(obj, gBinderOffsets.mObject);
+	    	GET_M_OBJECT(obj, gBinderOffsets.mObject);
         return jbh != NULL ? jbh->get(env) : NULL;
     }
 
     if (env->IsInstanceOf(obj, gBinderProxyOffsets.mClass)) {
         return (IBinder*)
-            env->GetIntField(obj, gBinderProxyOffsets.mObject);
+            GET_M_OBJECT(obj, gBinderProxyOffsets.mObject);
     }
 
     LOGW("ibinderForJavaObject: %p is not a Binder object", obj);
@@ -630,15 +640,15 @@ static void android_os_Binder_init(JNIEnv* env, jobject clazz)
     }
     LOGV("Java Binder %p: acquiring first ref on holder %p", clazz, jbh);
     jbh->incStrong(clazz);
-    env->SetIntField(clazz, gBinderOffsets.mObject, (int)jbh);
+    SET_M_OBJECT(clazz, gBinderOffsets.mObject, jbh);
 }
 
 static void android_os_Binder_destroy(JNIEnv* env, jobject clazz)
 {
     JavaBBinderHolder* jbh = (JavaBBinderHolder*)
-        env->GetIntField(clazz, gBinderOffsets.mObject);
+        GET_M_OBJECT(clazz, gBinderOffsets.mObject);
     if (jbh != NULL) {
-        env->SetIntField(clazz, gBinderOffsets.mObject, 0);
+        SET_M_OBJECT(clazz, gBinderOffsets.mObject, 0);
         LOGV("Java Binder %p: removing ref on holder %p", clazz, jbh);
         jbh->decStrong(clazz);
     } else {
@@ -682,7 +692,7 @@ static int int_register_android_os_Binder(JNIEnv* env)
     assert(gBinderOffsets.mExecTransact);
 
     gBinderOffsets.mObject
-        = env->GetFieldID(clazz, "mObject", "I");
+        = env->GetFieldID(clazz, "mObject", M_OBJECT_TYPE);
     assert(gBinderOffsets.mObject);
 
     return AndroidRuntime::registerNativeMethods(
@@ -777,7 +787,7 @@ static int int_register_android_os_BinderInternal(JNIEnv* env)
 static jboolean android_os_BinderProxy_pingBinder(JNIEnv* env, jobject obj)
 {
     IBinder* target = (IBinder*)
-        env->GetIntField(obj, gBinderProxyOffsets.mObject);
+        GET_M_OBJECT(obj, gBinderProxyOffsets.mObject);
     if (target == NULL) {
         return JNI_FALSE;
     }
@@ -787,7 +797,7 @@ static jboolean android_os_BinderProxy_pingBinder(JNIEnv* env, jobject obj)
 
 static jstring android_os_BinderProxy_getInterfaceDescriptor(JNIEnv* env, jobject obj)
 {
-    IBinder* target = (IBinder*) env->GetIntField(obj, gBinderProxyOffsets.mObject);
+    IBinder* target = (IBinder*) GET_M_OBJECT(obj, gBinderProxyOffsets.mObject);
     if (target != NULL) {
         const String16& desc = target->getInterfaceDescriptor();
         return env->NewString(desc.string(), desc.size());
@@ -800,7 +810,7 @@ static jstring android_os_BinderProxy_getInterfaceDescriptor(JNIEnv* env, jobjec
 static jboolean android_os_BinderProxy_isBinderAlive(JNIEnv* env, jobject obj)
 {
     IBinder* target = (IBinder*)
-        env->GetIntField(obj, gBinderProxyOffsets.mObject);
+        GET_M_OBJECT(obj, gBinderProxyOffsets.mObject);
     if (target == NULL) {
         return JNI_FALSE;
     }
@@ -921,7 +931,7 @@ static jboolean android_os_BinderProxy_transact(JNIEnv* env, jobject obj,
     }
 
     IBinder* target = (IBinder*)
-        env->GetIntField(obj, gBinderProxyOffsets.mObject);
+        GET_M_OBJECT(obj, gBinderProxyOffsets.mObject);
     if (target == NULL) {
         jniThrowException(env, "java/lang/IllegalStateException", "Binder has been finalized!");
         return JNI_FALSE;
@@ -964,7 +974,7 @@ static void android_os_BinderProxy_linkToDeath(JNIEnv* env, jobject obj,
     }
 
     IBinder* target = (IBinder*)
-        env->GetIntField(obj, gBinderProxyOffsets.mObject);
+        GET_M_OBJECT(obj, gBinderProxyOffsets.mObject);
     if (target == NULL) {
         LOGW("Binder has been finalized when calling linkToDeath() with recip=%p)\n", recipient);
         assert(false);
@@ -994,7 +1004,7 @@ static jboolean android_os_BinderProxy_unlinkToDeath(JNIEnv* env, jobject obj,
     }
 
     IBinder* target = (IBinder*)
-        env->GetIntField(obj, gBinderProxyOffsets.mObject);
+        GET_M_OBJECT(obj, gBinderProxyOffsets.mObject);
     if (target == NULL) {
         LOGW("Binder has been finalized when calling linkToDeath() with recip=%p)\n", recipient);
         return JNI_FALSE;
@@ -1026,9 +1036,9 @@ static jboolean android_os_BinderProxy_unlinkToDeath(JNIEnv* env, jobject obj,
 static void android_os_BinderProxy_destroy(JNIEnv* env, jobject obj)
 {
     IBinder* b = (IBinder*)
-        env->GetIntField(obj, gBinderProxyOffsets.mObject);
+        GET_M_OBJECT(obj, gBinderProxyOffsets.mObject);
     LOGV("Destroying BinderProxy %p: binder=%p\n", obj, b);
-    env->SetIntField(obj, gBinderProxyOffsets.mObject, 0);
+    SET_M_OBJECT(obj, gBinderProxyOffsets.mObject, 0);
     b->decStrong(obj);
     IPCThreadState::self()->flushCommands();
 }
@@ -1075,7 +1085,7 @@ static int int_register_android_os_BinderProxy(JNIEnv* env)
     assert(gBinderProxyOffsets.mSendDeathNotice);
 
     gBinderProxyOffsets.mObject
-        = env->GetFieldID(clazz, "mObject", "I");
+        = env->GetFieldID(clazz, "mObject", M_OBJECT_TYPE);
     assert(gBinderProxyOffsets.mObject);
     gBinderProxyOffsets.mSelf
         = env->GetFieldID(clazz, "mSelf", "Ljava/lang/ref/WeakReference;");
@@ -1453,19 +1463,19 @@ static void android_os_Parcel_init(JNIEnv* env, jobject clazz, jint parcelInt)
     }
     //LOGI("Initializing obj %p from C++ Parcel %p, own=%d\n", clazz, parcel, own);
     env->SetIntField(clazz, gParcelOffsets.mOwnObject, own);
-    env->SetIntField(clazz, gParcelOffsets.mObject, (int)parcel);
+    SET_M_OBJECT(clazz, gParcelOffsets.mObject, parcel);
 }
 
 static void android_os_Parcel_destroy(JNIEnv* env, jobject clazz)
 {
     int32_t own = env->GetIntField(clazz, gParcelOffsets.mOwnObject);
     if (own) {
         Parcel* parcel = parcelForJavaObject(env, clazz);
-        env->SetIntField(clazz, gParcelOffsets.mObject, 0);
+        SET_M_OBJECT(clazz, gParcelOffsets.mObject, 0);
         //LOGI("Destroying obj %p: deleting C++ Parcel %p\n", clazz, parcel);
         delete parcel;
     } else {
-        env->SetIntField(clazz, gParcelOffsets.mObject, 0);
+        SET_M_OBJECT(clazz, gParcelOffsets.mObject, 0);
         //LOGI("Destroying obj %p: leaving C++ Parcel %p\n", clazz);
     }
 }
@@ -1666,7 +1676,7 @@ static int int_register_android_os_Parcel(JNIEnv* env)
     LOG_FATAL_IF(clazz == NULL, "Unable to find class android.os.Parcel");
 
     gParcelOffsets.mObject
-        = env->GetFieldID(clazz, "mObject", "I");
+        = env->GetFieldID(clazz, "mObject", M_OBJECT_TYPE);
     gParcelOffsets.mOwnObject
         = env->GetFieldID(clazz, "mOwnObject", "I");
 

external/android-libs/arm64-v8a/libnativehelper.so

@@ -37,8 +37,8 @@ static jfieldID gWindowField;
 static jfieldID gBufferField;
 static jfieldID gSizeCopiedField;
 
-#define GET_WINDOW(env, object) ((CursorWindow *)env->GetIntField(object, gWindowField))
-#define SET_WINDOW(env, object, window) (env->SetIntField(object, gWindowField, (int)window))
+#define GET_WINDOW(env, object) ((CursorWindow *)env->GetLongField(object, gWindowField))
+#define SET_WINDOW(env, object, window) (env->SetLongField(object, gWindowField, (long long int)window))
 #define SET_BUFFER(env, object, buf) (env->SetObjectField(object, gBufferField, buf))
 #define SET_SIZE_COPIED(env, object, size) (env->SetIntField(object, gSizeCopiedField, size))
 
@@ -706,7 +706,7 @@ int register_android_database_CursorWindow(JNIEnv * env)
         return -1;
     }
 
-    gWindowField = env->GetFieldID(clazz, "nWindow", "I");
+    gWindowField = env->GetFieldID(clazz, "nWindow", "J");
 
     if (gWindowField == NULL) {
         LOGE("Error locating fields");

external/android-libs/arm64-v8a/libssl.a

@@ -39,9 +39,9 @@ static jfieldID gStatementField;
 
 
 #define GET_STATEMENT(env, object) \
-        (sqlite3_stmt *)env->GetIntField(object, gStatementField)
+        (sqlite3_stmt *)env->GetLongField(object, gStatementField)
 #define GET_HANDLE(env, object) \
-        (sqlite3 *)env->GetIntField(object, gHandleField)
+        (sqlite3 *)env->GetLongField(object, gHandleField)
 
 
 sqlite3_stmt * compile(JNIEnv* env, jobject object,
@@ -55,7 +55,7 @@ sqlite3_stmt * compile(JNIEnv* env, jobject object,
     // Make sure not to leak the statement if it already exists
     if (statement != NULL) {
         sqlite3_finalize(statement);
-        env->SetIntField(object, gStatementField, 0);
+        env->SetLongField(object, gStatementField, 0);
     }
 
     // Compile the SQL
@@ -67,7 +67,7 @@ sqlite3_stmt * compile(JNIEnv* env, jobject object,
     if (err == SQLITE_OK) {
         // Store the statement in the Java object for future calls
         LOGV("Prepared statement %p on %p", statement, handle);
-        env->SetIntField(object, gStatementField, (int)statement);
+        env->SetLongField(object, gStatementField, (long long int) statement);
         return statement;
     } else {
         // Error messages like 'near ")": syntax error' are not
@@ -98,7 +98,7 @@ static void native_finalize(JNIEnv* env, jobject object)
 
     if (statement != NULL) {
         sqlite3_finalize(statement);
-        env->SetIntField(object, gStatementField, 0);
+        env->SetLongField(object, gStatementField, 0);
     }
 }
 
@@ -119,8 +119,8 @@ int register_android_database_SQLiteCompiledSql(JNIEnv * env)
         return -1;
     }
 
-    gHandleField = env->GetFieldID(clazz, "nHandle", "I");
-    gStatementField = env->GetFieldID(clazz, "nStatement", "I");
+    gHandleField = env->GetFieldID(clazz, "nHandle", "J");
+    gStatementField = env->GetFieldID(clazz, "nStatement", "J");
 
     if (gHandleField == NULL || gStatementField == NULL) {
         LOGE("Error locating fields");