From 9c450ae8aaac18e93d8f3b771d64fde469343fe6 Mon Sep 17 00:00:00 2001
From: Tristan Matthews <tristan.matthews@savoirfairelinux.com>
Date: Thu, 7 Aug 2014 12:29:58 -0400
Subject: [PATCH] jni: fix everything but java build
---
Makefile | 3 +--
sflphone-android/assets/builddate.txt | 1 +
sflphone-android/assets/builder.txt | 1 +
sflphone-android/assets/revision.txt | 1 +
sflphone-android/project.properties | 2 +-
5 files changed, 5 insertions(+), 3 deletions(-)
create mode 100644 sflphone-android/assets/builddate.txt
create mode 100644 sflphone-android/assets/builder.txt
create mode 100644 sflphone-android/assets/revision.txt
diff --git a/Makefile b/Makefile
index 18e8f8372..5f63a9bfe 100644
--- a/Makefile
+++ b/Makefile
@@ -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)
diff --git a/sflphone-android/assets/builddate.txt b/sflphone-android/assets/builddate.txt
new file mode 100644
index 000000000..3d089304e
--- /dev/null
+++ b/sflphone-android/assets/builddate.txt
@@ -0,0 +1 @@
+2014-08-07
diff --git a/sflphone-android/assets/builder.txt b/sflphone-android/assets/builder.txt
new file mode 100644
index 000000000..535020477
--- /dev/null
+++ b/sflphone-android/assets/builder.txt
@@ -0,0 +1 @@
+tmatth@bodega
diff --git a/sflphone-android/assets/revision.txt b/sflphone-android/assets/revision.txt
new file mode 100644
index 000000000..d2cebd00c
--- /dev/null
+++ b/sflphone-android/assets/revision.txt
@@ -0,0 +1 @@
+719259d
diff --git a/sflphone-android/project.properties b/sflphone-android/project.properties
index a3ee5ab64..4ab125693 100644
--- a/sflphone-android/project.properties
+++ b/sflphone-android/project.properties
@@ -11,4 +11,4 @@
#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
# Project target.
-target=android-17
+target=android-19
--
GitLab