From ccbb9606b725b8f1d7eeccf14c358b146aeee491 Mon Sep 17 00:00:00 2001
From: ylecollen <ylecollen@amdocs.com>
Date: Tue, 10 Jan 2017 16:06:21 +0100
Subject: [PATCH] Move the android project from /Java/Android/OlmLibSdk

---
 .DS_Store                                        | Bin 0 -> 6148 bytes
 README.rst                                       |   2 +-
 android/.DS_Store                                | Bin 0 -> 6148 bytes
 {java/android/OlmLibSdk => android}/README.rst   |   2 +-
 {java/android/OlmLibSdk => android}/build.gradle |   0
 .../OlmLibSdk => android}/gradle.properties      |   0
 .../gradle/wrapper/gradle-wrapper.jar            | Bin
 .../gradle/wrapper/gradle-wrapper.properties     |   0
 {java/android/OlmLibSdk => android}/gradlew      |   0
 {java/android/OlmLibSdk => android}/gradlew.bat  |   0
 .../OlmLibSdk => android}/olm-sdk/build.gradle   |   0
 .../java/org/matrix/olm/OlmAccountTest.java      |   0
 .../java/org/matrix/olm/OlmGroupSessionTest.java |   0
 .../java/org/matrix/olm/OlmSessionTest.java      |   0
 .../java/org/matrix/olm/OlmUtilityTest.java      |   0
 .../java/org/matrix/olm/TestHelper.java          |   0
 .../olm-sdk/src/main/AndroidManifest.xml         |   0
 .../org/matrix/olm/CommonSerializeUtils.java     |   0
 .../src/main/java/org/matrix/olm/OlmAccount.java |   0
 .../main/java/org/matrix/olm/OlmException.java   |   0
 .../org/matrix/olm/OlmInboundGroupSession.java   |   0
 .../src/main/java/org/matrix/olm/OlmManager.java |   0
 .../src/main/java/org/matrix/olm/OlmMessage.java |   0
 .../org/matrix/olm/OlmOutboundGroupSession.java  |   0
 .../src/main/java/org/matrix/olm/OlmSession.java |   0
 .../src/main/java/org/matrix/olm/OlmUtility.java |   0
 .../olm-sdk/src/main/jni/Android.mk              |   2 +-
 .../olm-sdk/src/main/jni/Application.mk          |   0
 .../olm-sdk/src/main/jni/olm_account.cpp         |   0
 .../olm-sdk/src/main/jni/olm_account.h           |   0
 .../src/main/jni/olm_inbound_group_session.cpp   |   0
 .../src/main/jni/olm_inbound_group_session.h     |   0
 .../olm-sdk/src/main/jni/olm_jni.h               |   0
 .../olm-sdk/src/main/jni/olm_jni_helper.cpp      |   0
 .../olm-sdk/src/main/jni/olm_jni_helper.h        |   0
 .../olm-sdk/src/main/jni/olm_manager.cpp         |   0
 .../olm-sdk/src/main/jni/olm_manager.h           |   0
 .../src/main/jni/olm_outbound_group_session.cpp  |   0
 .../src/main/jni/olm_outbound_group_session.h    |   0
 .../olm-sdk/src/main/jni/olm_session.cpp         |   0
 .../olm-sdk/src/main/jni/olm_session.h           |   0
 .../olm-sdk/src/main/jni/olm_utility.cpp         |   0
 .../olm-sdk/src/main/jni/olm_utility.h           |   0
 .../olm-sdk/src/main/res/values/strings.xml      |   0
 .../OlmLibSdk => android}/settings.gradle        |   0
 45 files changed, 3 insertions(+), 3 deletions(-)
 create mode 100644 .DS_Store
 create mode 100644 android/.DS_Store
 rename {java/android/OlmLibSdk => android}/README.rst (89%)
 rename {java/android/OlmLibSdk => android}/build.gradle (100%)
 rename {java/android/OlmLibSdk => android}/gradle.properties (100%)
 rename {java/android/OlmLibSdk => android}/gradle/wrapper/gradle-wrapper.jar (100%)
 rename {java/android/OlmLibSdk => android}/gradle/wrapper/gradle-wrapper.properties (100%)
 rename {java/android/OlmLibSdk => android}/gradlew (100%)
 rename {java/android/OlmLibSdk => android}/gradlew.bat (100%)
 rename {java/android/OlmLibSdk => android}/olm-sdk/build.gradle (100%)
 rename {java/android/OlmLibSdk => android}/olm-sdk/src/androidTest/java/org/matrix/olm/OlmAccountTest.java (100%)
 rename {java/android/OlmLibSdk => android}/olm-sdk/src/androidTest/java/org/matrix/olm/OlmGroupSessionTest.java (100%)
 rename {java/android/OlmLibSdk => android}/olm-sdk/src/androidTest/java/org/matrix/olm/OlmSessionTest.java (100%)
 rename {java/android/OlmLibSdk => android}/olm-sdk/src/androidTest/java/org/matrix/olm/OlmUtilityTest.java (100%)
 rename {java/android/OlmLibSdk => android}/olm-sdk/src/androidTest/java/org/matrix/olm/TestHelper.java (100%)
 rename {java/android/OlmLibSdk => android}/olm-sdk/src/main/AndroidManifest.xml (100%)
 rename {java/android/OlmLibSdk => android}/olm-sdk/src/main/java/org/matrix/olm/CommonSerializeUtils.java (100%)
 rename {java/android/OlmLibSdk => android}/olm-sdk/src/main/java/org/matrix/olm/OlmAccount.java (100%)
 rename {java/android/OlmLibSdk => android}/olm-sdk/src/main/java/org/matrix/olm/OlmException.java (100%)
 rename {java/android/OlmLibSdk => android}/olm-sdk/src/main/java/org/matrix/olm/OlmInboundGroupSession.java (100%)
 rename {java/android/OlmLibSdk => android}/olm-sdk/src/main/java/org/matrix/olm/OlmManager.java (100%)
 rename {java/android/OlmLibSdk => android}/olm-sdk/src/main/java/org/matrix/olm/OlmMessage.java (100%)
 rename {java/android/OlmLibSdk => android}/olm-sdk/src/main/java/org/matrix/olm/OlmOutboundGroupSession.java (100%)
 rename {java/android/OlmLibSdk => android}/olm-sdk/src/main/java/org/matrix/olm/OlmSession.java (100%)
 rename {java/android/OlmLibSdk => android}/olm-sdk/src/main/java/org/matrix/olm/OlmUtility.java (100%)
 rename {java/android/OlmLibSdk => android}/olm-sdk/src/main/jni/Android.mk (97%)
 rename {java/android/OlmLibSdk => android}/olm-sdk/src/main/jni/Application.mk (100%)
 rename {java/android/OlmLibSdk => android}/olm-sdk/src/main/jni/olm_account.cpp (100%)
 rename {java/android/OlmLibSdk => android}/olm-sdk/src/main/jni/olm_account.h (100%)
 rename {java/android/OlmLibSdk => android}/olm-sdk/src/main/jni/olm_inbound_group_session.cpp (100%)
 rename {java/android/OlmLibSdk => android}/olm-sdk/src/main/jni/olm_inbound_group_session.h (100%)
 rename {java/android/OlmLibSdk => android}/olm-sdk/src/main/jni/olm_jni.h (100%)
 rename {java/android/OlmLibSdk => android}/olm-sdk/src/main/jni/olm_jni_helper.cpp (100%)
 rename {java/android/OlmLibSdk => android}/olm-sdk/src/main/jni/olm_jni_helper.h (100%)
 rename {java/android/OlmLibSdk => android}/olm-sdk/src/main/jni/olm_manager.cpp (100%)
 rename {java/android/OlmLibSdk => android}/olm-sdk/src/main/jni/olm_manager.h (100%)
 rename {java/android/OlmLibSdk => android}/olm-sdk/src/main/jni/olm_outbound_group_session.cpp (100%)
 rename {java/android/OlmLibSdk => android}/olm-sdk/src/main/jni/olm_outbound_group_session.h (100%)
 rename {java/android/OlmLibSdk => android}/olm-sdk/src/main/jni/olm_session.cpp (100%)
 rename {java/android/OlmLibSdk => android}/olm-sdk/src/main/jni/olm_session.h (100%)
 rename {java/android/OlmLibSdk => android}/olm-sdk/src/main/jni/olm_utility.cpp (100%)
 rename {java/android/OlmLibSdk => android}/olm-sdk/src/main/jni/olm_utility.h (100%)
 rename {java/android/OlmLibSdk => android}/olm-sdk/src/main/res/values/strings.xml (100%)
 rename {java/android/OlmLibSdk => android}/settings.gradle (100%)

diff --git a/.DS_Store b/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..5008ddfcf53c02e82d7eee2e57c38e5672ef89f6
GIT binary patch
literal 6148
zcmeH~Jr2S!425mzP>H1@V-^m;4Wg<&0T*E43hX&L&p$$qDprKhvt+--jT7}7np#A3
zem<@ulZcFPQ@L2!n>{z**<q8>++&mCkOWA81W14cNZ<zv;LbK1Poaz?KmsK2CSc!(
z0ynLxE!0092;Krf2c+FF_Fe*7ECH>lEfg7;MkzE(HCqgga^y>{tEnwC%0;vJ&^%eQ
zLs35+`xjp>T0<F0fCPF1$Cyrb|F7^5{eNG?83~ZUUlGt@xh*qZDeu<Z%US-OSsOPv
j)R!Z4KLME7ReXlK;d!wEw5GODWMKRea10D2@KpjYNUI8I

literal 0
HcmV?d00001

diff --git a/README.rst b/README.rst
index 6a509d4..4568fff 100644
--- 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
diff --git a/android/.DS_Store b/android/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..5008ddfcf53c02e82d7eee2e57c38e5672ef89f6
GIT binary patch
literal 6148
zcmeH~Jr2S!425mzP>H1@V-^m;4Wg<&0T*E43hX&L&p$$qDprKhvt+--jT7}7np#A3
zem<@ulZcFPQ@L2!n>{z**<q8>++&mCkOWA81W14cNZ<zv;LbK1Poaz?KmsK2CSc!(
z0ynLxE!0092;Krf2c+FF_Fe*7ECH>lEfg7;MkzE(HCqgga^y>{tEnwC%0;vJ&^%eQ
zLs35+`xjp>T0<F0fCPF1$Cyrb|F7^5{eNG?83~ZUUlGt@xh*qZDeu<Z%US-OSsOPv
j)R!Z4KLME7ReXlK;d!wEw5GODWMKRea10D2@KpjYNUI8I

literal 0
HcmV?d00001

diff --git a/java/android/OlmLibSdk/README.rst b/android/README.rst
similarity index 89%
rename from java/android/OlmLibSdk/README.rst
rename to android/README.rst
index 6a9eae8..46beaab 100644
--- a/java/android/OlmLibSdk/README.rst
+++ b/android/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.
 
diff --git a/java/android/OlmLibSdk/build.gradle b/android/build.gradle
similarity index 100%
rename from java/android/OlmLibSdk/build.gradle
rename to android/build.gradle
diff --git a/java/android/OlmLibSdk/gradle.properties b/android/gradle.properties
similarity index 100%
rename from java/android/OlmLibSdk/gradle.properties
rename to android/gradle.properties
diff --git a/java/android/OlmLibSdk/gradle/wrapper/gradle-wrapper.jar b/android/gradle/wrapper/gradle-wrapper.jar
similarity index 100%
rename from java/android/OlmLibSdk/gradle/wrapper/gradle-wrapper.jar
rename to android/gradle/wrapper/gradle-wrapper.jar
diff --git a/java/android/OlmLibSdk/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties
similarity index 100%
rename from java/android/OlmLibSdk/gradle/wrapper/gradle-wrapper.properties
rename to android/gradle/wrapper/gradle-wrapper.properties
diff --git a/java/android/OlmLibSdk/gradlew b/android/gradlew
similarity index 100%
rename from java/android/OlmLibSdk/gradlew
rename to android/gradlew
diff --git a/java/android/OlmLibSdk/gradlew.bat b/android/gradlew.bat
similarity index 100%
rename from java/android/OlmLibSdk/gradlew.bat
rename to android/gradlew.bat
diff --git a/java/android/OlmLibSdk/olm-sdk/build.gradle b/android/olm-sdk/build.gradle
similarity index 100%
rename from java/android/OlmLibSdk/olm-sdk/build.gradle
rename to android/olm-sdk/build.gradle
diff --git a/java/android/OlmLibSdk/olm-sdk/src/androidTest/java/org/matrix/olm/OlmAccountTest.java b/android/olm-sdk/src/androidTest/java/org/matrix/olm/OlmAccountTest.java
similarity index 100%
rename from java/android/OlmLibSdk/olm-sdk/src/androidTest/java/org/matrix/olm/OlmAccountTest.java
rename to android/olm-sdk/src/androidTest/java/org/matrix/olm/OlmAccountTest.java
diff --git a/java/android/OlmLibSdk/olm-sdk/src/androidTest/java/org/matrix/olm/OlmGroupSessionTest.java b/android/olm-sdk/src/androidTest/java/org/matrix/olm/OlmGroupSessionTest.java
similarity index 100%
rename from java/android/OlmLibSdk/olm-sdk/src/androidTest/java/org/matrix/olm/OlmGroupSessionTest.java
rename to android/olm-sdk/src/androidTest/java/org/matrix/olm/OlmGroupSessionTest.java
diff --git a/java/android/OlmLibSdk/olm-sdk/src/androidTest/java/org/matrix/olm/OlmSessionTest.java b/android/olm-sdk/src/androidTest/java/org/matrix/olm/OlmSessionTest.java
similarity index 100%
rename from java/android/OlmLibSdk/olm-sdk/src/androidTest/java/org/matrix/olm/OlmSessionTest.java
rename to android/olm-sdk/src/androidTest/java/org/matrix/olm/OlmSessionTest.java
diff --git a/java/android/OlmLibSdk/olm-sdk/src/androidTest/java/org/matrix/olm/OlmUtilityTest.java b/android/olm-sdk/src/androidTest/java/org/matrix/olm/OlmUtilityTest.java
similarity index 100%
rename from java/android/OlmLibSdk/olm-sdk/src/androidTest/java/org/matrix/olm/OlmUtilityTest.java
rename to android/olm-sdk/src/androidTest/java/org/matrix/olm/OlmUtilityTest.java
diff --git a/java/android/OlmLibSdk/olm-sdk/src/androidTest/java/org/matrix/olm/TestHelper.java b/android/olm-sdk/src/androidTest/java/org/matrix/olm/TestHelper.java
similarity index 100%
rename from java/android/OlmLibSdk/olm-sdk/src/androidTest/java/org/matrix/olm/TestHelper.java
rename to android/olm-sdk/src/androidTest/java/org/matrix/olm/TestHelper.java
diff --git a/java/android/OlmLibSdk/olm-sdk/src/main/AndroidManifest.xml b/android/olm-sdk/src/main/AndroidManifest.xml
similarity index 100%
rename from java/android/OlmLibSdk/olm-sdk/src/main/AndroidManifest.xml
rename to android/olm-sdk/src/main/AndroidManifest.xml
diff --git a/java/android/OlmLibSdk/olm-sdk/src/main/java/org/matrix/olm/CommonSerializeUtils.java b/android/olm-sdk/src/main/java/org/matrix/olm/CommonSerializeUtils.java
similarity index 100%
rename from java/android/OlmLibSdk/olm-sdk/src/main/java/org/matrix/olm/CommonSerializeUtils.java
rename to android/olm-sdk/src/main/java/org/matrix/olm/CommonSerializeUtils.java
diff --git a/java/android/OlmLibSdk/olm-sdk/src/main/java/org/matrix/olm/OlmAccount.java b/android/olm-sdk/src/main/java/org/matrix/olm/OlmAccount.java
similarity index 100%
rename from java/android/OlmLibSdk/olm-sdk/src/main/java/org/matrix/olm/OlmAccount.java
rename to android/olm-sdk/src/main/java/org/matrix/olm/OlmAccount.java
diff --git a/java/android/OlmLibSdk/olm-sdk/src/main/java/org/matrix/olm/OlmException.java b/android/olm-sdk/src/main/java/org/matrix/olm/OlmException.java
similarity index 100%
rename from java/android/OlmLibSdk/olm-sdk/src/main/java/org/matrix/olm/OlmException.java
rename to android/olm-sdk/src/main/java/org/matrix/olm/OlmException.java
diff --git a/java/android/OlmLibSdk/olm-sdk/src/main/java/org/matrix/olm/OlmInboundGroupSession.java b/android/olm-sdk/src/main/java/org/matrix/olm/OlmInboundGroupSession.java
similarity index 100%
rename from java/android/OlmLibSdk/olm-sdk/src/main/java/org/matrix/olm/OlmInboundGroupSession.java
rename to android/olm-sdk/src/main/java/org/matrix/olm/OlmInboundGroupSession.java
diff --git a/java/android/OlmLibSdk/olm-sdk/src/main/java/org/matrix/olm/OlmManager.java b/android/olm-sdk/src/main/java/org/matrix/olm/OlmManager.java
similarity index 100%
rename from java/android/OlmLibSdk/olm-sdk/src/main/java/org/matrix/olm/OlmManager.java
rename to android/olm-sdk/src/main/java/org/matrix/olm/OlmManager.java
diff --git a/java/android/OlmLibSdk/olm-sdk/src/main/java/org/matrix/olm/OlmMessage.java b/android/olm-sdk/src/main/java/org/matrix/olm/OlmMessage.java
similarity index 100%
rename from java/android/OlmLibSdk/olm-sdk/src/main/java/org/matrix/olm/OlmMessage.java
rename to android/olm-sdk/src/main/java/org/matrix/olm/OlmMessage.java
diff --git a/java/android/OlmLibSdk/olm-sdk/src/main/java/org/matrix/olm/OlmOutboundGroupSession.java b/android/olm-sdk/src/main/java/org/matrix/olm/OlmOutboundGroupSession.java
similarity index 100%
rename from java/android/OlmLibSdk/olm-sdk/src/main/java/org/matrix/olm/OlmOutboundGroupSession.java
rename to android/olm-sdk/src/main/java/org/matrix/olm/OlmOutboundGroupSession.java
diff --git a/java/android/OlmLibSdk/olm-sdk/src/main/java/org/matrix/olm/OlmSession.java b/android/olm-sdk/src/main/java/org/matrix/olm/OlmSession.java
similarity index 100%
rename from java/android/OlmLibSdk/olm-sdk/src/main/java/org/matrix/olm/OlmSession.java
rename to android/olm-sdk/src/main/java/org/matrix/olm/OlmSession.java
diff --git a/java/android/OlmLibSdk/olm-sdk/src/main/java/org/matrix/olm/OlmUtility.java b/android/olm-sdk/src/main/java/org/matrix/olm/OlmUtility.java
similarity index 100%
rename from java/android/OlmLibSdk/olm-sdk/src/main/java/org/matrix/olm/OlmUtility.java
rename to android/olm-sdk/src/main/java/org/matrix/olm/OlmUtility.java
diff --git a/java/android/OlmLibSdk/olm-sdk/src/main/jni/Android.mk b/android/olm-sdk/src/main/jni/Android.mk
similarity index 97%
rename from java/android/OlmLibSdk/olm-sdk/src/main/jni/Android.mk
rename to android/olm-sdk/src/main/jni/Android.mk
index ffe1f67..97d747c 100644
--- a/java/android/OlmLibSdk/olm-sdk/src/main/jni/Android.mk
+++ b/android/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))
diff --git a/java/android/OlmLibSdk/olm-sdk/src/main/jni/Application.mk b/android/olm-sdk/src/main/jni/Application.mk
similarity index 100%
rename from java/android/OlmLibSdk/olm-sdk/src/main/jni/Application.mk
rename to android/olm-sdk/src/main/jni/Application.mk
diff --git a/java/android/OlmLibSdk/olm-sdk/src/main/jni/olm_account.cpp b/android/olm-sdk/src/main/jni/olm_account.cpp
similarity index 100%
rename from java/android/OlmLibSdk/olm-sdk/src/main/jni/olm_account.cpp
rename to android/olm-sdk/src/main/jni/olm_account.cpp
diff --git a/java/android/OlmLibSdk/olm-sdk/src/main/jni/olm_account.h b/android/olm-sdk/src/main/jni/olm_account.h
similarity index 100%
rename from java/android/OlmLibSdk/olm-sdk/src/main/jni/olm_account.h
rename to android/olm-sdk/src/main/jni/olm_account.h
diff --git a/java/android/OlmLibSdk/olm-sdk/src/main/jni/olm_inbound_group_session.cpp b/android/olm-sdk/src/main/jni/olm_inbound_group_session.cpp
similarity index 100%
rename from java/android/OlmLibSdk/olm-sdk/src/main/jni/olm_inbound_group_session.cpp
rename to android/olm-sdk/src/main/jni/olm_inbound_group_session.cpp
diff --git a/java/android/OlmLibSdk/olm-sdk/src/main/jni/olm_inbound_group_session.h b/android/olm-sdk/src/main/jni/olm_inbound_group_session.h
similarity index 100%
rename from java/android/OlmLibSdk/olm-sdk/src/main/jni/olm_inbound_group_session.h
rename to android/olm-sdk/src/main/jni/olm_inbound_group_session.h
diff --git a/java/android/OlmLibSdk/olm-sdk/src/main/jni/olm_jni.h b/android/olm-sdk/src/main/jni/olm_jni.h
similarity index 100%
rename from java/android/OlmLibSdk/olm-sdk/src/main/jni/olm_jni.h
rename to android/olm-sdk/src/main/jni/olm_jni.h
diff --git a/java/android/OlmLibSdk/olm-sdk/src/main/jni/olm_jni_helper.cpp b/android/olm-sdk/src/main/jni/olm_jni_helper.cpp
similarity index 100%
rename from java/android/OlmLibSdk/olm-sdk/src/main/jni/olm_jni_helper.cpp
rename to android/olm-sdk/src/main/jni/olm_jni_helper.cpp
diff --git a/java/android/OlmLibSdk/olm-sdk/src/main/jni/olm_jni_helper.h b/android/olm-sdk/src/main/jni/olm_jni_helper.h
similarity index 100%
rename from java/android/OlmLibSdk/olm-sdk/src/main/jni/olm_jni_helper.h
rename to android/olm-sdk/src/main/jni/olm_jni_helper.h
diff --git a/java/android/OlmLibSdk/olm-sdk/src/main/jni/olm_manager.cpp b/android/olm-sdk/src/main/jni/olm_manager.cpp
similarity index 100%
rename from java/android/OlmLibSdk/olm-sdk/src/main/jni/olm_manager.cpp
rename to android/olm-sdk/src/main/jni/olm_manager.cpp
diff --git a/java/android/OlmLibSdk/olm-sdk/src/main/jni/olm_manager.h b/android/olm-sdk/src/main/jni/olm_manager.h
similarity index 100%
rename from java/android/OlmLibSdk/olm-sdk/src/main/jni/olm_manager.h
rename to android/olm-sdk/src/main/jni/olm_manager.h
diff --git a/java/android/OlmLibSdk/olm-sdk/src/main/jni/olm_outbound_group_session.cpp b/android/olm-sdk/src/main/jni/olm_outbound_group_session.cpp
similarity index 100%
rename from java/android/OlmLibSdk/olm-sdk/src/main/jni/olm_outbound_group_session.cpp
rename to android/olm-sdk/src/main/jni/olm_outbound_group_session.cpp
diff --git a/java/android/OlmLibSdk/olm-sdk/src/main/jni/olm_outbound_group_session.h b/android/olm-sdk/src/main/jni/olm_outbound_group_session.h
similarity index 100%
rename from java/android/OlmLibSdk/olm-sdk/src/main/jni/olm_outbound_group_session.h
rename to android/olm-sdk/src/main/jni/olm_outbound_group_session.h
diff --git a/java/android/OlmLibSdk/olm-sdk/src/main/jni/olm_session.cpp b/android/olm-sdk/src/main/jni/olm_session.cpp
similarity index 100%
rename from java/android/OlmLibSdk/olm-sdk/src/main/jni/olm_session.cpp
rename to android/olm-sdk/src/main/jni/olm_session.cpp
diff --git a/java/android/OlmLibSdk/olm-sdk/src/main/jni/olm_session.h b/android/olm-sdk/src/main/jni/olm_session.h
similarity index 100%
rename from java/android/OlmLibSdk/olm-sdk/src/main/jni/olm_session.h
rename to android/olm-sdk/src/main/jni/olm_session.h
diff --git a/java/android/OlmLibSdk/olm-sdk/src/main/jni/olm_utility.cpp b/android/olm-sdk/src/main/jni/olm_utility.cpp
similarity index 100%
rename from java/android/OlmLibSdk/olm-sdk/src/main/jni/olm_utility.cpp
rename to android/olm-sdk/src/main/jni/olm_utility.cpp
diff --git a/java/android/OlmLibSdk/olm-sdk/src/main/jni/olm_utility.h b/android/olm-sdk/src/main/jni/olm_utility.h
similarity index 100%
rename from java/android/OlmLibSdk/olm-sdk/src/main/jni/olm_utility.h
rename to android/olm-sdk/src/main/jni/olm_utility.h
diff --git a/java/android/OlmLibSdk/olm-sdk/src/main/res/values/strings.xml b/android/olm-sdk/src/main/res/values/strings.xml
similarity index 100%
rename from java/android/OlmLibSdk/olm-sdk/src/main/res/values/strings.xml
rename to android/olm-sdk/src/main/res/values/strings.xml
diff --git a/java/android/OlmLibSdk/settings.gradle b/android/settings.gradle
similarity index 100%
rename from java/android/OlmLibSdk/settings.gradle
rename to android/settings.gradle