Merge pull request #43 from matrix-org/pedroc/android_e2e_dev

Android wrappers for olm library

Merge pull request #43 from matrix-org/pedroc/android_e2e_dev
14c30da0 · Yannick LE COLLEN · GitHub · bd6ab72c · ccbb9606 · 14c30da0
Commit 14c30da0 authored 8 years ago by Yannick LE COLLEN Committed by GitHub 8 years ago
--- a/android/olm-sdk/src/main/jni/olm_session.h
+++ b/android/olm-sdk/src/main/jni/olm_session.h
--- a/android/olm-sdk/src/main/jni/olm_utility.cpp
+++ b/android/olm-sdk/src/main/jni/olm_utility.cpp
--- a/android/olm-sdk/src/main/jni/olm_utility.h
+++ b/android/olm-sdk/src/main/jni/olm_utility.h
--- a/android/olm-sdk/src/main/res/values/strings.xml
+++ b/android/olm-sdk/src/main/res/values/strings.xml
+<resources>
+    <string name="app_name">OlmSdk</string>
+</resources>
--- a/android/settings.gradle
+++ b/android/settings.gradle
+include ':olm-sdk'