diff options
| author | krasimir <krasimir@chalmers.se> | 2015-09-04 11:18:21 +0000 |
|---|---|---|
| committer | krasimir <krasimir@chalmers.se> | 2015-09-04 11:18:21 +0000 |
| commit | 206e38028f9e642c26e3717310fdb1af4a8bc594 (patch) | |
| tree | 1d79691fc6b25dc6a8456278305fed9150a17a7c /src/ui/android | |
| parent | 8cc7ccf80bbd64158a8e0d815cf8feed573d4462 (diff) | |
libsg is now accessible on android
Diffstat (limited to 'src/ui/android')
| -rw-r--r-- | src/ui/android/README | 3 | ||||
| -rw-r--r-- | src/ui/android/jni/Android.mk | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/src/ui/android/README b/src/ui/android/README index 1d3bda521..16d9c1104 100644 --- a/src/ui/android/README +++ b/src/ui/android/README @@ -23,8 +23,7 @@ $ $ANDROID_SDK_LOCATION/tools/android update project -p . Build libs/libjpgf.jar: -$ (cd ../../runtime/java && javac org/grammaticalframework/pgf/*.java && jar -cf libjpgf.jar org/grammaticalframework/pgf/*.class) -$ cp ../../runtime/java/libjpgf.jar libs +$ (cd ../../runtime/java && javac org/grammaticalframework/*/*.java && jar -cf ../../ui/android/libs/jpgf.jar org/grammaticalframework/*/*.class) Build JNI code: diff --git a/src/ui/android/jni/Android.mk b/src/ui/android/jni/Android.mk index ffcb66199..b53bf4cf2 100644 --- a/src/ui/android/jni/Android.mk +++ b/src/ui/android/jni/Android.mk @@ -2,7 +2,8 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) -jni_c_files := jpgf.c +jni_c_files := jpgf.c jsg.c jni_utils.c +sg_c_files := sg.c pgf_c_files := data.c expr.c graphviz.c linearizer.c literals.c parser.c parseval.c pgf.c printer.c reader.c \ reasoner.c evaluator.c jit.c typechecker.c gu_c_files := assert.c choice.c exn.c fun.c in.c map.c out.c utf8.c \ @@ -10,6 +11,7 @@ bits.c defs.c enum.c file.c hash.c mem.c prime.c seq.c string.c uc LOCAL_MODULE := jpgf LOCAL_SRC_FILES := $(addprefix ../../../runtime/java/, $(jni_c_files)) \ + $(addprefix ../../../runtime/c/sg/, $(sg_c_files)) \ $(addprefix ../../../runtime/c/pgf/, $(pgf_c_files)) \ $(addprefix ../../../runtime/c/gu/, $(gu_c_files)) LOCAL_C_INCLUDES := ../../../runtime/c |