diff options
| author | Yves <yvesf-git@xapek.org> | 2015-03-09 22:24:48 +0100 |
|---|---|---|
| committer | Yves <yvesf-git@xapek.org> | 2015-03-09 22:24:48 +0100 |
| commit | 1fe7a0202dc7570cb289c3f8d40d8b59797a966c (patch) | |
| tree | 88dd38fd77e11ffb276a7e08f7e1b81479e2060c /jni | |
| parent | f08ea668c3059995ea390ab566bd25f3a68b0ef1 (diff) | |
| parent | 23d9368d169b2ce355b68711b0de3e77f742bedb (diff) | |
| download | andiodine-1fe7a0202dc7570cb289c3f8d40d8b59797a966c.tar.gz andiodine-1fe7a0202dc7570cb289c3f8d40d8b59797a966c.zip | |
Merge pull request #15 from 2m/wip-gradle-build
Gradle build
Diffstat (limited to 'jni')
| -rw-r--r-- | jni/Android.mk | 2 | ||||
| -rw-r--r-- | jni/iodine-client.c | 1 | ||||
| -rw-r--r-- | jni/iodine/src/base64.c | 2 |
3 files changed, 2 insertions, 3 deletions
diff --git a/jni/Android.mk b/jni/Android.mk index 06cf936..2117fb6 100644 --- a/jni/Android.mk +++ b/jni/Android.mk @@ -26,7 +26,7 @@ $(LOCAL_PATH)/iodine/src/base64u.h: $(LOCAL_PATH)/iodine/src/base64.h @echo '/* No use in editing, produced by Makefile! */' > $@ @sed -e 's/\([Bb][Aa][Ss][Ee]64\)/\1u/g ; s/0123456789+/0123456789_/' < $< >> $@ -LOCAL_MODULE := iodine-client +LOCAL_MODULE := iodine-client LOCAL_LDLIBS := -lz -llog LOCAL_CFLAGS := -Wall LOCAL_SRC_FILES := iodine-client.c \ diff --git a/jni/iodine-client.c b/jni/iodine-client.c index 905b154..11ef7cf 100644 --- a/jni/iodine-client.c +++ b/jni/iodine-client.c @@ -212,4 +212,3 @@ JNIEXPORT jstring JNICALL Java_org_xapek_andiodine_IodineClient_getPropertyNetDn __system_property_get("net.dns1", value); return (*env)->NewStringUTF(env, value); } - diff --git a/jni/iodine/src/base64.c b/jni/iodine/src/base64.c index 00a84fc..71bbcf1 100644 --- a/jni/iodine/src/base64.c +++ b/jni/iodine/src/base64.c @@ -90,7 +90,7 @@ base64_reverse_init() } } -static int +static int base64_encode(char *buf, size_t *buflen, const void *data, size_t size) /* * Fills *buf with max. *buflen characters, encoding size bytes of *data. |