Skip to content

Commit 1d509ee

Browse files
illarionovillarionov
committed
x86 build
1 parent 22b1151 commit 1d509ee

21 files changed

+20
-11
lines changed

‎Makefile‎

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,14 @@ clean:
3030
ant clean
3131
cd ${EXTERNAL_DIR} && ndk-build clean
3232
-cd ${SQLCIPHER_DIR} && make clean
33-
cd ${JNI_DIR} && ndk-build clean
33+
cd ${JNI_DIR} && ndk-build clean
3434
-rm ${LIBRARY_ROOT}/armeabi/libsqlcipher_android.so
3535
-rm ${LIBRARY_ROOT}/armeabi/libdatabase_sqlcipher.so
36+
-rm ${LIBRARY_ROOT}/armeabi/libstlport_shared.so
3637
-rm ${LIBRARY_ROOT}/sqlcipher.jar
38+
-rm ${LIBRARY_ROOT}/x86/libsqlcipher_android.so
39+
-rm ${LIBRARY_ROOT}/x86/libdatabase_sqlcipher.so
40+
-rm ${LIBRARY_ROOT}/x86/libstlport_shared.so
3741

3842
copy-libs:
3943
mkdir -p ${LIBRARY_ROOT}/armeabi
@@ -44,6 +48,13 @@ copy-libs:
4448
cp ${CURDIR}/bin/classes/sqlcipher.jar ${LIBRARY_ROOT} && \
4549
cp ${ANDROID_NDK_ROOT}/sources/cxx-stl/stlport/libs/armeabi/libstlport_shared.so \
4650
${LIBRARY_ROOT}/armeabi
51+
mkdir -p ${LIBRARY_ROOT}/x86
52+
cp ${EXTERNAL_DIR}/libs/x86/libsqlcipher_android.so \
53+
${LIBRARY_ROOT}/x86 && \
54+
cp ${JNI_DIR}/libs/x86/libdatabase_sqlcipher.so \
55+
${LIBRARY_ROOT}/x86 && \
56+
cp ${ANDROID_NDK_ROOT}/sources/cxx-stl/stlport/libs/x86/libstlport_shared.so \
57+
${LIBRARY_ROOT}/x86
4758

4859
copy-libs-dist:
4960
cp ${LIBRARY_ROOT}/*.jar dist/SQLCipherForAndroid-SDK/libs/ && \

‎external/Android.mk‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ sqlcipher/sqlite3.c:
1919
copy-libs-hack: build-local-hack
2020
install -p -m644 libs/armeabi/*.so ../obj/local/armeabi/
2121

22-
project_ldflags:= -Llibs/armeabi/ -Landroid-libs/
22+
project_ldflags:= -Llibs/$(TARGET_ARCH_ABI)/ -Landroid-libs/$(TARGET_ARCH_ABI)/
2323

2424
#------------------------------------------------------------------------------#
2525
# libsqlite3
@@ -75,7 +75,8 @@ LOCAL_ALLOW_UNDEFINED_SYMBOLS := false
7575
#LOCAL_REQUIRED_MODULES += libsqlcipher libicui18n libicuuc
7676
LOCAL_STATIC_LIBRARIES := libsqlcipher libicui18n libicuuc
7777

78-
LOCAL_CFLAGS += $(android_sqlite_cflags) $(sqlite_cflags) -DOS_PATH_SEPARATOR="'/'"
78+
LOCAL_CFLAGS += $(android_sqlite_cflags) $(sqlite_cflags) \
79+
-DOS_PATH_SEPARATOR="'/'" -DHAVE_SYS_UIO_H
7980

8081
LOCAL_C_INCLUDES := \
8182
$(LOCAL_PATH)/includes \
@@ -85,7 +86,7 @@ LOCAL_C_INCLUDES := \
8586
$(LOCAL_PATH)/platform-system-core/include \
8687
$(LOCAL_PATH)/platform-frameworks-base/include
8788

88-
LOCAL_LDFLAGS += -L$(LOCAL_PATH)/android-libs/ -L$(LOCAL_PATH)/libs/armeabi/
89+
LOCAL_LDFLAGS += -L${LOCAL_PATH}/android-libs/$(TARGET_ARCH_ABI)/ -L$(LOCAL_PATH)/libs/$(TARGET_ARCH_ABI)/
8990
LOCAL_LDLIBS := -llog -lutils -lcutils -lcrypto
9091
LOCAL_MODULE := libsqlcipher_android
9192
LOCAL_MODULE_FILENAME := libsqlcipher_android

‎external/String16.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
# define htons(x) (x)
4343
# endif
4444
#else
45-
//# include <netinet/in.h>
45+
# include <netinet/in.h>
4646
# include <sys/endian.h>
4747
#endif
4848

external/android-libs/libandroid_runtime.so renamed to external/android-libs/armeabi/libandroid_runtime.so

File renamed without changes.

external/android-libs/libbinder.so renamed to external/android-libs/armeabi/libbinder.so

File renamed without changes.

external/android-libs/libcrypto.so renamed to external/android-libs/armeabi/libcrypto.so

File renamed without changes.

external/android-libs/libcutils.so renamed to external/android-libs/armeabi/libcutils.so

File renamed without changes.

external/android-libs/liblog.so renamed to external/android-libs/armeabi/liblog.so

File renamed without changes.

external/android-libs/libnativehelper.so renamed to external/android-libs/armeabi/libnativehelper.so

File renamed without changes.

external/android-libs/libstlport_shared.so renamed to external/android-libs/armeabi/libstlport_shared.so

File renamed without changes.

0 commit comments

Comments
 (0)