merging

build-android/build.sh

@@ -4,8 +4,6 @@ set -e
 
 build_version=1
 ANDROID_PLATFORM=android-21
-openssl_build_version=1
-cyrus_sasl_build_version=1
 libetpan_build_version=1
 archs="armeabi armeabi-v7a x86 x86_64"
 package_name=pEpEngine-android
@@ -34,8 +32,6 @@ function build {
   
   cd "$current_dir/jni"
   $ANDROID_NDK/ndk-build V=1 TARGET_PLATFORM=$ANDROID_PLATFORM TARGET_ARCH_ABI=$TARGET_ARCH_ABI \
-    OPENSSL_PATH="$current_dir/third-party/openssl-android-$openssl_build_version" \
-    CYRUS_SASL_PATH="$current_dir/third-party/cyrus-sasl-android-$cyrus_sasl_build_version" \
     LIBETPAN_PATH="$current_dir/third-party/libetpan-android-$libetpan_build_version"
 
   mkdir -p "$current_dir/$package_name-$build_version/libs/$TARGET_ARCH_ABI"
@@ -45,8 +41,6 @@ function build {
 
 mkdir -p "$current_dir/third-party"
 cd "$current_dir/third-party"
-unzip -qo "$libetpan_dir/dependencies/openssl/openssl-android-$openssl_build_version.zip"
-unzip -qo "$libetpan_dir/dependencies/cyrus-sasl/cyrus-sasl-android-$cyrus_sasl_build_version.zip"
 unzip -qo "$libetpan_dir/libetpan-android-$libetpan_build_version.zip"
 
 # Copy public headers to include

build-android/jni/Android.mk

@@ -4,14 +4,6 @@ LOCAL_PATH := $(call my-dir)
 
 include $(CLEAR_VARS)
 
-ifeq ($(OPENSSL_PATH),)
-$(error OPENSSL_PATH must be set)
-endif
-
-ifeq ($(CYRUS_SASL_PATH),)
-$(error CYRUS_SASL_PATH must be set)
-endif
-
 ifeq ($(LIBETPAN_PATH),)
 $(error LIBETPAN_PATH must be set)
 endif
@@ -43,8 +35,6 @@ LOCAL_SRC_FILES := ../../src/bloblist.c \
 
 LOCAL_C_INCLUDES := ../../src \
                     $(GPGME_INCLUDE_PATH) \
-                    $(OPENSSL_PATH)/include \
-                    $(CYRUS_SASL_PATH)/include \
                     $(LIBETPAN_PATH)/include
 
 include $(BUILD_STATIC_LIBRARY)

db/make_systemdb.cmd

@@ -0,0 +1,5 @@
+@echo off
+
+if exist system.db del /f system.db
+sqlite3 -batch system.db < create_system_db.sql
+for %%c in (*.csv) do echo %%c && echo .import "%%c" wordlist | sqlite3 -batch -csv system.db