Fix to build script to clean sqlcipher core during clean phase, also cleaned up Android.mk build script for sqlcipher

developernotes · developernotes · commit eeca91c1bfd4 · 2012-03-15T11:19:03.000-05:00
diff --git a/Makefile b/Makefile
@@ -25,7 +25,8 @@ build-java:
 
 clean:
 	ant clean
-	cd external/ && ndk-build clean 
+	cd external/ && ndk-build clean
+	cd external/sqlcipher && make clean
 	cd jni/ && ndk-build clean 
 	-rm ${LIBRARY_ROOT}/armeabi/libsqlcipher_android.so
 	-rm ${LIBRARY_ROOT}/armeabi/libdatabase_sqlcipher.so
diff --git a/external/Android.mk b/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 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
