Merge remote-tracking branch 'origin/pedroc/android_e2e_dev' into pedroc/android_e2e_dev

This commit is contained in:
ylecollen 2017-01-10 14:45:30 +01:00
commit 8ea5bc7960

View file

@ -1,25 +1,28 @@
OlmLibSdk OlmLibSdk
========= =========
OlmLibSdk exposes An android wrapper to libolm. OlmLibSdk exposes an android wrapper to libolm.
Installation Installation
------------ ------------
Create a libs directory in your project directory Create a libs directory in your project directory
Copy the olm-sdk.aar into it. Copy the olm-sdk.aar into it.
In your build.gradle file, add in the android section
In your build.gradle file, add in the android section::
repositories { repositories {
flatDir { flatDir {
dir 'libs' dir 'libs'
} }
} }
Add in the dependencies category
Add in the dependencies category::
compile(name: 'olm-sdk', ext: 'aar') compile(name: 'olm-sdk', ext: 'aar')
Development Development
----------- -----------
import the project from the /java/android/OlmLibSdk path. import the project from the ``/java/android/OlmLibSdk`` path.
The project contains some JNI files and some Java wraper files. The project contains some JNI files and some Java wraper files.