Skip to content
Snippets Groups Projects
Commit 9c450ae8 authored by Tristan Matthews's avatar Tristan Matthews
Browse files

jni: fix everything but java build

parent 719259dd
No related branches found
No related tags found
No related merge requests found
......@@ -9,7 +9,7 @@ export SFLPHONE_SRC=$(PWD)/sflphone
LIBSFLPHONEJNI_H=sflphone/daemon/src/sflphone.h
LIBSFLPHONEJNI=$(SRC)/obj/local/$(ARCH)/libsflphone.so
JAVA_SOURCES=$(SRC)/src/org/sflphone/*.java
JAVA_SOURCES=$(shell find $(SRC)/src/org/sflphone/ -type f -name "*.java")
JNI_SOURCES=$(SRC)/jni/*.cpp $(SRC)/jni/*.h
ifneq ($(V),)
......@@ -38,7 +38,6 @@ $(SFLPHONE_APK): $(LIBSFLPHONEJNI) $(JAVA_SOURCES)
date +"%Y-%m-%d" > $(SRC)/assets/builddate.txt
echo `id -u -n`@`hostname` > $(SRC)/assets/builder.txt
git rev-parse --short HEAD > $(SRC)/assets/revision.txt
./gen-env.sh $(SRC)
$(VERBOSE)cd $(SRC) && ant $(ANT_OPTS) $(ANT_TARGET)
$(LIBSFLPHONEJNI): $(JNI_SOURCES) $(LIBSFLPHONEJNI_H)
......
2014-08-07
tmatth@bodega
719259d
......@@ -11,4 +11,4 @@
#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
# Project target.
target=android-17
target=android-19
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment