Move the android project from /Java/Android/OlmLibSdk

2017-01-10 16:06:21 +01:00 · 2017-01-10 16:06:21 +01:00 · ccbb9606b7
commit ccbb9606b7
parent 8ea5bc7960
45 changed files with 3 additions and 3 deletions
--- a/.DS_Store
+++ b/.DS_Store
--- a/README.rst
+++ b/README.rst
@ -36,7 +36,7 @@ To build the javascript bindings, install emscripten from http://kripken.github.
 To build the android project for Android bindings, run:

 	.. code:: bash
-	cd java/android/OlmLibSdk
+	cd android
 	./gradlew clean assembleRelease

 Release process
--- a/android/.DS_Store
+++ b/android/.DS_Store
--- a/java/android/OlmLibSdk/README.rst
+++ b/java/android/OlmLibSdk/README.rst
@ -22,7 +22,7 @@ Add in the dependencies category::

 Development
 -----------
-import the project from the ``/java/android/OlmLibSdk`` path.
+import the project from the ``android/`` path.

 The project contains some JNI files and some Java wraper files.

--- a/java/android/OlmLibSdk/build.gradle
+++ b/java/android/OlmLibSdk/build.gradle
--- a/java/android/OlmLibSdk/gradle.properties
+++ b/java/android/OlmLibSdk/gradle.properties
--- a/java/android/OlmLibSdk/gradle/wrapper/gradle-wrapper.jar
+++ b/java/android/OlmLibSdk/gradle/wrapper/gradle-wrapper.jar
--- a/java/android/OlmLibSdk/gradle/wrapper/gradle-wrapper.properties
+++ b/java/android/OlmLibSdk/gradle/wrapper/gradle-wrapper.properties
--- a/java/android/OlmLibSdk/gradlew
+++ b/java/android/OlmLibSdk/gradlew
--- a/java/android/OlmLibSdk/gradlew.bat
+++ b/java/android/OlmLibSdk/gradlew.bat
--- a/java/android/OlmLibSdk/olm-sdk/build.gradle
+++ b/java/android/OlmLibSdk/olm-sdk/build.gradle
--- a/java/android/OlmLibSdk/olm-sdk/src/androidTest/java/org/matrix/olm/OlmAccountTest.java
+++ b/java/android/OlmLibSdk/olm-sdk/src/androidTest/java/org/matrix/olm/OlmAccountTest.java
--- a/java/android/OlmLibSdk/olm-sdk/src/androidTest/java/org/matrix/olm/OlmGroupSessionTest.java
+++ b/java/android/OlmLibSdk/olm-sdk/src/androidTest/java/org/matrix/olm/OlmGroupSessionTest.java
--- a/java/android/OlmLibSdk/olm-sdk/src/androidTest/java/org/matrix/olm/OlmSessionTest.java
+++ b/java/android/OlmLibSdk/olm-sdk/src/androidTest/java/org/matrix/olm/OlmSessionTest.java
--- a/java/android/OlmLibSdk/olm-sdk/src/androidTest/java/org/matrix/olm/OlmUtilityTest.java
+++ b/java/android/OlmLibSdk/olm-sdk/src/androidTest/java/org/matrix/olm/OlmUtilityTest.java
--- a/java/android/OlmLibSdk/olm-sdk/src/androidTest/java/org/matrix/olm/TestHelper.java
+++ b/java/android/OlmLibSdk/olm-sdk/src/androidTest/java/org/matrix/olm/TestHelper.java
--- a/java/android/OlmLibSdk/olm-sdk/src/main/AndroidManifest.xml
+++ b/java/android/OlmLibSdk/olm-sdk/src/main/AndroidManifest.xml
--- a/java/android/OlmLibSdk/olm-sdk/src/main/java/org/matrix/olm/CommonSerializeUtils.java
+++ b/java/android/OlmLibSdk/olm-sdk/src/main/java/org/matrix/olm/CommonSerializeUtils.java
--- a/java/android/OlmLibSdk/olm-sdk/src/main/java/org/matrix/olm/OlmAccount.java
+++ b/java/android/OlmLibSdk/olm-sdk/src/main/java/org/matrix/olm/OlmAccount.java
--- a/java/android/OlmLibSdk/olm-sdk/src/main/java/org/matrix/olm/OlmException.java
+++ b/java/android/OlmLibSdk/olm-sdk/src/main/java/org/matrix/olm/OlmException.java
--- a/java/android/OlmLibSdk/olm-sdk/src/main/java/org/matrix/olm/OlmInboundGroupSession.java
+++ b/java/android/OlmLibSdk/olm-sdk/src/main/java/org/matrix/olm/OlmInboundGroupSession.java
--- a/java/android/OlmLibSdk/olm-sdk/src/main/java/org/matrix/olm/OlmManager.java
+++ b/java/android/OlmLibSdk/olm-sdk/src/main/java/org/matrix/olm/OlmManager.java
--- a/java/android/OlmLibSdk/olm-sdk/src/main/java/org/matrix/olm/OlmMessage.java
+++ b/java/android/OlmLibSdk/olm-sdk/src/main/java/org/matrix/olm/OlmMessage.java
--- a/java/android/OlmLibSdk/olm-sdk/src/main/java/org/matrix/olm/OlmOutboundGroupSession.java
+++ b/java/android/OlmLibSdk/olm-sdk/src/main/java/org/matrix/olm/OlmOutboundGroupSession.java
--- a/java/android/OlmLibSdk/olm-sdk/src/main/java/org/matrix/olm/OlmSession.java
+++ b/java/android/OlmLibSdk/olm-sdk/src/main/java/org/matrix/olm/OlmSession.java
--- a/java/android/OlmLibSdk/olm-sdk/src/main/java/org/matrix/olm/OlmUtility.java
+++ b/java/android/OlmLibSdk/olm-sdk/src/main/java/org/matrix/olm/OlmUtility.java
--- a/java/android/OlmLibSdk/olm-sdk/src/main/jni/Android.mk
+++ b/java/android/OlmLibSdk/olm-sdk/src/main/jni/Android.mk
@ -6,7 +6,7 @@ MAJOR := 2
 MINOR := 0
 PATCH := 0
 OLM_VERSION := $(MAJOR).$(MINOR).$(PATCH)
-SRC_ROOT_DIR := ../../../../../../..
+SRC_ROOT_DIR := ../../../../..

 $(info LOCAL_PATH=$(LOCAL_PATH))
 $(info SRC_ROOT_DIR=$(SRC_ROOT_DIR))
--- a/java/android/OlmLibSdk/olm-sdk/src/main/jni/Application.mk
+++ b/java/android/OlmLibSdk/olm-sdk/src/main/jni/Application.mk
--- a/java/android/OlmLibSdk/olm-sdk/src/main/jni/olm_account.cpp
+++ b/java/android/OlmLibSdk/olm-sdk/src/main/jni/olm_account.cpp
--- a/java/android/OlmLibSdk/olm-sdk/src/main/jni/olm_account.h
+++ b/java/android/OlmLibSdk/olm-sdk/src/main/jni/olm_account.h
--- a/java/android/OlmLibSdk/olm-sdk/src/main/jni/olm_inbound_group_session.cpp
+++ b/java/android/OlmLibSdk/olm-sdk/src/main/jni/olm_inbound_group_session.cpp
--- a/java/android/OlmLibSdk/olm-sdk/src/main/jni/olm_inbound_group_session.h
+++ b/java/android/OlmLibSdk/olm-sdk/src/main/jni/olm_inbound_group_session.h
--- a/java/android/OlmLibSdk/olm-sdk/src/main/jni/olm_jni.h
+++ b/java/android/OlmLibSdk/olm-sdk/src/main/jni/olm_jni.h
--- a/java/android/OlmLibSdk/olm-sdk/src/main/jni/olm_jni_helper.cpp
+++ b/java/android/OlmLibSdk/olm-sdk/src/main/jni/olm_jni_helper.cpp
--- a/java/android/OlmLibSdk/olm-sdk/src/main/jni/olm_jni_helper.h
+++ b/java/android/OlmLibSdk/olm-sdk/src/main/jni/olm_jni_helper.h
--- a/java/android/OlmLibSdk/olm-sdk/src/main/jni/olm_manager.cpp
+++ b/java/android/OlmLibSdk/olm-sdk/src/main/jni/olm_manager.cpp
--- a/java/android/OlmLibSdk/olm-sdk/src/main/jni/olm_manager.h
+++ b/java/android/OlmLibSdk/olm-sdk/src/main/jni/olm_manager.h
--- a/java/android/OlmLibSdk/olm-sdk/src/main/jni/olm_outbound_group_session.cpp
+++ b/java/android/OlmLibSdk/olm-sdk/src/main/jni/olm_outbound_group_session.cpp
--- a/java/android/OlmLibSdk/olm-sdk/src/main/jni/olm_outbound_group_session.h
+++ b/java/android/OlmLibSdk/olm-sdk/src/main/jni/olm_outbound_group_session.h
--- a/java/android/OlmLibSdk/olm-sdk/src/main/jni/olm_session.cpp
+++ b/java/android/OlmLibSdk/olm-sdk/src/main/jni/olm_session.cpp
--- a/java/android/OlmLibSdk/olm-sdk/src/main/jni/olm_session.h
+++ b/java/android/OlmLibSdk/olm-sdk/src/main/jni/olm_session.h
--- a/java/android/OlmLibSdk/olm-sdk/src/main/jni/olm_utility.cpp
+++ b/java/android/OlmLibSdk/olm-sdk/src/main/jni/olm_utility.cpp
--- a/java/android/OlmLibSdk/olm-sdk/src/main/jni/olm_utility.h
+++ b/java/android/OlmLibSdk/olm-sdk/src/main/jni/olm_utility.h
--- a/java/android/OlmLibSdk/olm-sdk/src/main/res/values/strings.xml
+++ b/java/android/OlmLibSdk/olm-sdk/src/main/res/values/strings.xml
--- a/java/android/OlmLibSdk/settings.gradle
+++ b/java/android/OlmLibSdk/settings.gradle