diff options
| author | kr.angelov <kr.angelov@gmail.com> | 2013-09-05 12:19:59 +0000 |
|---|---|---|
| committer | kr.angelov <kr.angelov@gmail.com> | 2013-09-05 12:19:59 +0000 |
| commit | 46f2460a926a93a5bff360b0bfe7a52a983f2a56 (patch) | |
| tree | 341b6c5e5ff21a405086b3482dbf3ccd6d34fc3b /src | |
| parent | d7916c1b085826fc6be73527dde70db00941e909 (diff) | |
move src/runtime/android to src/ui/android/jni
Diffstat (limited to 'src')
| -rw-r--r-- | src/ui/android/.classpath | 7 | ||||
| -rw-r--r-- | src/ui/android/jni/Android.mk (renamed from src/runtime/android/Android.mk) | 8 | ||||
| -rw-r--r-- | src/ui/android/jni/Application.mk (renamed from src/runtime/android/Application.mk) | 0 |
3 files changed, 10 insertions, 5 deletions
diff --git a/src/ui/android/.classpath b/src/ui/android/.classpath index 48f4f566f..2f27127f0 100644 --- a/src/ui/android/.classpath +++ b/src/ui/android/.classpath @@ -3,8 +3,11 @@ <classpathentry kind="src" path="src"/> <classpathentry kind="src" path="gen"/> <classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/> - <classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/> + <classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"> + <attributes> + <attribute name="org.eclipse.jdt.launching.CLASSPATH_ATTR_LIBRARY_PATH_ENTRY" value="jni"/> + </attributes> + </classpathentry> <classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/> - <classpathentry combineaccessrules="false" kind="src" path="/jpgf"/> <classpathentry kind="output" path="bin/classes"/> </classpath> diff --git a/src/runtime/android/Android.mk b/src/ui/android/jni/Android.mk index a670f689c..febd57a65 100644 --- a/src/runtime/android/Android.mk +++ b/src/ui/android/jni/Android.mk @@ -2,13 +2,15 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) -jni_c_files := ../java/jpgf.c +jni_c_files := jpgf.c pgf_c_files := data.c expr.c graphviz.c lexer.c linearizer.c literals.c parser.c parseval.c pgf.c printer.c reader.c reasoner.c gu_c_files := assert.c choice.c exn.c fun.c in.c list.c map.c out.c str.c type.c utf8.c \ bits.c defs.c enum.c file.c hash.c intern.c log.c mem.c prime.c seq.c string.c ucs.c variant.c LOCAL_MODULE := jpgf -LOCAL_SRC_FILES := $(addprefix ../c/pgf/, $(pgf_c_files)) $(addprefix ../c/gu/, $(gu_c_files)) -LOCAL_C_INCLUDES := ../c +LOCAL_SRC_FILES := $(addprefix ../../../runtime/java/, $(jni_c_files)) \ + $(addprefix ../../../runtime/c/pgf/, $(pgf_c_files)) \ + $(addprefix ../../../runtime/c/gu/, $(gu_c_files)) +LOCAL_C_INCLUDES := ../../../runtime/c include $(BUILD_SHARED_LIBRARY) diff --git a/src/runtime/android/Application.mk b/src/ui/android/jni/Application.mk index 1c6face0e..1c6face0e 100644 --- a/src/runtime/android/Application.mk +++ b/src/ui/android/jni/Application.mk |