Skip to content

Commit a5f0752

Browse files
committed
updates to enable the clean to work better, and for copying libs to the dist
1 parent 33b7ea0 commit a5f0752

File tree

1 file changed

+8
-1
lines changed

1 file changed

+8
-1
lines changed

Makefile

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,14 @@ all: clean build-external build-jni build-java copy-libs
1111
build-external:
1212
cd external/ && \
1313
make -f Android.mk build-local-hack && \
14+
ndk-build clean && \
1415
ndk-build && \
1516
make -f Android.mk copy-libs-hack
1617

1718
build-jni:
18-
cd jni/ && ndk-build
19+
cd jni/ && \
20+
ndk-build clean && \
21+
ndk-build
1922

2023
build-java:
2124
ant clean && \
@@ -36,3 +39,7 @@ copy-libs:
3639
cp bin/classes/sqlcipher.jar ${LIBRARY_ROOT} && \
3740
cp ${ANDROID_NDK_ROOT}/sources/cxx-stl/stlport/libs/armeabi/libstlport_shared.so \
3841
${LIBRARY_ROOT}/armeabi
42+
43+
copy-libs-dist:
44+
cp ${LIBRARY_ROOT}/*.jar dist/SQLCipherForAndroid-SDK/libs/ && \
45+
cp ${LIBRARY_ROOT}/armeabi/*.so dist/SQLCipherForAndroid-SDK/libs/armeabi/

0 commit comments

Comments
 (0)