Build configuration that includes a statically linked version of the …

…icu project and sqlcipher

build.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project name="android-database-sqlcipher" default="help">
+<project name="foobar" default="help">
 
 <!-- The local.properties file is created and updated by the 'android'
      tool.

external/Android.mk

@@ -26,7 +26,7 @@ copy-libs-hack: build-local-hack
 	install -p -m644 libs/armeabi/*.so ../obj/local/armeabi/
 ##	install -p -m644 android-2.2/*.so ../obj/local/armeabi/
 
-project_ldflags:= -Llibs/armeabi/ -Landroid-2.3/
+project_ldflags:= -Llibs/armeabi/ -Landroid-2.1/
 
 #------------------------------------------------------------------------------#
 # libsqlite3
@@ -51,7 +51,7 @@ LOCAL_LDLIBS += -lcrypto
 LOCAL_MODULE    := libsqlcipher
 LOCAL_SRC_FILES := $(sqlcipher_files)
 
-include $(BUILD_SHARED_LIBRARY)
+include $(BUILD_STATIC_LIBRARY)
 
 #------------------------------------------------------------------------------#
 # libsqlcipher_android (our version of Android's libsqlite_android)
@@ -63,6 +63,7 @@ libsqlite3_android_local_src_files := \
 	android-sqlite/android/PhoneNumberUtils.cpp \
 	android-sqlite/android/OldPhoneNumberUtils.cpp \
 	android-sqlite/android/PhoneticStringUtils.cpp \
+	platform-frameworks-base/libs/utils/String8.cpp
 #	android-sqlite/android/PhoneNumberUtilsTest.cpp \
 #	android-sqlite/android/PhoneticStringUtilsTest.cpp \
 
@@ -73,20 +74,25 @@ include $(CLEAR_VARS)
 LOCAL_ALLOW_UNDEFINED_SYMBOLS := false
 
 # TODO this needs to depend on libsqlcipher being built, how to do that?
+#LOCAL_REQUIRED_MODULES += libsqlcipher libicui18n libicuuc 
+LOCAL_STATIC_LIBRARIES := libsqlcipher libicui18n libicuuc
+
+LOCAL_CFLAGS += $(android_sqlite_cflags) $(sqlite_cflags) -DOS_PATH_SEPARATOR="'/'"
 
-LOCAL_REQUIRED_MODULES += libsqlcipher
-LOCAL_CFLAGS += $(android_sqlite_cflags) $(sqlite_cflags)
 LOCAL_C_INCLUDES := \
 	$(LOCAL_PATH)/sqlcipher \
 	$(LOCAL_PATH)/include \
 	$(LOCAL_PATH)/icu4c/i18n \
 	$(LOCAL_PATH)/icu4c/common \
 	$(LOCAL_PATH)/platform-system-core/include \
 	$(LOCAL_PATH)/platform-frameworks-base/include
-#LOCAL_LDFLAGS +=  $(project_ldflags)
-LOCAL_LDFLAGS += -L$(LOCAL_PATH)/android-2.3/ -L$(LOCAL_PATH)/libs/armeabi/
-LOCAL_LDLIBS := -lsqlcipher -llog -licuuc -licui18n -lutils -lcutils
+
+LOCAL_LDFLAGS += -L$(LOCAL_PATH)/android-2.1/ -L$(LOCAL_PATH)/libs/armeabi/
+LOCAL_LDLIBS := -llog -lutils -lcutils -lcrypto
 LOCAL_MODULE := libsqlcipher_android
+LOCAL_MODULE_FILENAME := libsqlcipher_android
 LOCAL_SRC_FILES := $(libsqlite3_android_local_src_files)
 
 include $(BUILD_SHARED_LIBRARY)
+
+include $(LOCAL_PATH)/icu4c/Android.mk

gen/info/guardianproject/database/IContentObserver.java

@@ -0,0 +1,100 @@
+/*
+ * This file is auto-generated.  DO NOT MODIFY.
+ * Original file: /Users/nparker/code/android-database-sqlcipher/src/info/guardianproject/database/IContentObserver.aidl
+ */
+package info.guardianproject.database;
+/**
+ * @hide
+ */
+public interface IContentObserver extends android.os.IInterface
+{
+/** Local-side IPC implementation stub class. */
+public static abstract class Stub extends android.os.Binder implements info.guardianproject.database.IContentObserver
+{
+private static final java.lang.String DESCRIPTOR = "info.guardianproject.database.IContentObserver";
+/** Construct the stub at attach it to the interface. */
+public Stub()
+{
+this.attachInterface(this, DESCRIPTOR);
+}
+/**
+ * Cast an IBinder object into an info.guardianproject.database.IContentObserver interface,
+ * generating a proxy if needed.
+ */
+public static info.guardianproject.database.IContentObserver asInterface(android.os.IBinder obj)
+{
+if ((obj==null)) {
+return null;
+}
+android.os.IInterface iin = (android.os.IInterface)obj.queryLocalInterface(DESCRIPTOR);
+if (((iin!=null)&&(iin instanceof info.guardianproject.database.IContentObserver))) {
+return ((info.guardianproject.database.IContentObserver)iin);
+}
+return new info.guardianproject.database.IContentObserver.Stub.Proxy(obj);
+}
+public android.os.IBinder asBinder()
+{
+return this;
+}
+@Override public boolean onTransact(int code, android.os.Parcel data, android.os.Parcel reply, int flags) throws android.os.RemoteException
+{
+switch (code)
+{
+case INTERFACE_TRANSACTION:
+{
+reply.writeString(DESCRIPTOR);
+return true;
+}
+case TRANSACTION_onChange:
+{
+data.enforceInterface(DESCRIPTOR);
+boolean _arg0;
+_arg0 = (0!=data.readInt());
+this.onChange(_arg0);
+return true;
+}
+}
+return super.onTransact(code, data, reply, flags);
+}
+private static class Proxy implements info.guardianproject.database.IContentObserver
+{
+private android.os.IBinder mRemote;
+Proxy(android.os.IBinder remote)
+{
+mRemote = remote;
+}
+public android.os.IBinder asBinder()
+{
+return mRemote;
+}
+public java.lang.String getInterfaceDescriptor()
+{
+return DESCRIPTOR;
+}
+/**
+     * This method is called when an update occurs to the cursor that is being
+     * observed. selfUpdate is true if the update was caused by a call to
+     * commit on the cursor that is being observed.
+     */
+public void onChange(boolean selfUpdate) throws android.os.RemoteException
+{
+android.os.Parcel _data = android.os.Parcel.obtain();
+try {
+_data.writeInterfaceToken(DESCRIPTOR);
+_data.writeInt(((selfUpdate)?(1):(0)));
+mRemote.transact(Stub.TRANSACTION_onChange, _data, null, android.os.IBinder.FLAG_ONEWAY);
+}
+finally {
+_data.recycle();
+}
+}
+}
+static final int TRANSACTION_onChange = (android.os.IBinder.FIRST_CALL_TRANSACTION + 0);
+}
+/**
+     * This method is called when an update occurs to the cursor that is being
+     * observed. selfUpdate is true if the update was caused by a call to
+     * commit on the cursor that is being observed.
+     */
+public void onChange(boolean selfUpdate) throws android.os.RemoteException;
+}

gen/info/guardianproject/database/R.java

@@ -0,0 +1,23 @@
+/* AUTO-GENERATED FILE.  DO NOT MODIFY.
+ *
+ * This class was automatically generated by the
+ * aapt tool from the resource data it found.  It
+ * should not be modified by hand.
+ */
+
+package info.guardianproject.database;
+
+public final class R {
+    public static final class attr {
+    }
+    public static final class drawable {
+        public static final int icon=0x7f020000;
+    }
+    public static final class layout {
+        public static final int main=0x7f030000;
+    }
+    public static final class string {
+        public static final int app_name=0x7f040001;
+        public static final int hello=0x7f040000;
+    }
+}

jni/Android.mk

@@ -8,7 +8,7 @@ else
 	LOCAL_CFLAGS += -DPACKED=""
 endif
 
-TARGET_PLATFORM := android-8
+#TARGET_PLATFORM := android-8
 
 ifeq ($(WITH_JIT),true)
 	LOCAL_CFLAGS += -DWITH_JIT
@@ -50,15 +50,17 @@ LOCAL_SHARED_LIBRARIES := \
 	libsqlite3_android
 
 LOCAL_CFLAGS += -U__APPLE__
-LOCAL_LDFLAGS += -L../external/android-2.2/ -L../external/libs/armeabi/
+LOCAL_LDFLAGS += -L../external/android-2.3/ -L../external/libs/armeabi/
 LOCAL_LDFLAGS += -L/home/n8fr8/android/mydroid/out/target/product/generic/obj/SHARED_LIBRARIES/libutils_intermediates/LINKED/ -L/home/n8fr8/android/mydroid/out/target/product/generic/obj/SHARED_LIBRARIES/libbinder_intermediates/LINKED/ -L/home/n8fr8/android/mydroid/out/target/product/generic/obj/SHARED_LIBRARIES/libandroid_runtime_intermediates/LINKED/
 
 # 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 -lutils -lbinder
 # these are build in the ../external section
-LOCAL_LDLIBS += -lsqlcipher -lsqlcipher_android
+
+#LOCAL_REQUIRED_MODULES += libsqlcipher libicuuc libicui18n
+LOCAL_LDLIBS += -lsqlcipher_android
 
 ifeq ($(WITH_MALLOC_LEAK_CHECK),true)
 	LOCAL_CFLAGS += -DMALLOC_LEAK_CHECK

jni/info_guardianproject_database_sqlcipher_SQLiteDatabase.cpp

@@ -94,8 +94,13 @@ static void registerLoggingFunc(const char *path) {
     loggingFuncSet = true;
 }
 
-
-
+/* public native void setICURoot(String path); */
+void setICURoot(JNIEnv* env, jobject object, jstring ICURoot)
+{
+  char const * ICURootPath = env->GetStringUTFChars(ICURoot, NULL);
+  setenv("SQLCIPHER_ICU_PREFIX", ICURootPath, 1);
+  env->ReleaseStringUTFChars(ICURoot, ICURootPath);
+}
 
 
 /* public native void dbopen(String path, int flags, String locale); */
@@ -463,7 +468,7 @@ static JNINativeMethod sMethods[] =
     {"native_setLocale", "(Ljava/lang/String;I)V", (void *)native_setLocale},
     {"native_getDbLookaside", "()I", (void *)native_getDbLookaside},
     {"releaseMemory", "()I", (void *)native_releaseMemory},
-
+    {"setICURoot", "(Ljava/lang/String;)V", (void *)setICURoot},
 };
 
 int register_android_database_SQLiteDatabase(JNIEnv *env)

local.properties

@@ -0,0 +1 @@
+sdk.dir=/Users/nparker/bin/android-sdk