Skip to content

Commit 62f6883

Browse files
committed
move ndk-clean tasks to clean target
1 parent 389f716 commit 62f6883

File tree

1 file changed

+9
-9
lines changed

1 file changed

+9
-9
lines changed

Makefile

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,38 +6,38 @@ init:
66
git submodule update --init
77
android update project -p .
88

9-
all: clean build-external build-jni build-java copy-libs
9+
all: build-external build-jni build-java copy-libs
1010

1111
build-external:
1212
cd external/ && \
1313
make -f Android.mk build-local-hack && \
14-
ndk-build clean && \
1514
ndk-build && \
16-
make -f Android.mk copy-libs-hack
15+
make -f Android.mk copy-libs-hack
1716

1817
build-jni:
1918
cd jni/ && \
20-
ndk-build clean && \
2119
ndk-build
2220

2321
build-java:
24-
ant clean && \
2522
ant release && \
2623
cd bin/classes && \
2724
jar -cvf sqlcipher.jar .
2825

2926
clean:
27+
ant clean
28+
cd external/ && ndk-build clean
29+
cd jni/ && ndk-build clean
3030
-rm ${LIBRARY_ROOT}/armeabi/libsqlcipher_android.so
3131
-rm ${LIBRARY_ROOT}/armeabi/libdatabase_sqlcipher.so
3232
-rm ${LIBRARY_ROOT}/sqlcipher.jar
3333

3434
copy-libs:
3535
cp external/libs/armeabi/libsqlcipher_android.so \
3636
${LIBRARY_ROOT}/armeabi && \
37-
cp jni/libs/armeabi/libdatabase_sqlcipher.so \
38-
${LIBRARY_ROOT}/armeabi && \
39-
cp bin/classes/sqlcipher.jar ${LIBRARY_ROOT} && \
40-
cp ${ANDROID_NDK_ROOT}/sources/cxx-stl/stlport/libs/armeabi/libstlport_shared.so \
37+
cp jni/libs/armeabi/libdatabase_sqlcipher.so \
38+
${LIBRARY_ROOT}/armeabi && \
39+
cp bin/classes/sqlcipher.jar ${LIBRARY_ROOT} && \
40+
cp ${ANDROID_NDK_ROOT}/sources/cxx-stl/stlport/libs/armeabi/libstlport_shared.so \
4141
${LIBRARY_ROOT}/armeabi
4242

4343
copy-libs-dist:

0 commit comments

Comments
 (0)