From a9aeb6b5d743cc203f8e76c1a180d0cd8d433ed8 Mon Sep 17 00:00:00 2001
From: Yannick LE COLLEN <yannick@matrix.org>
Date: Thu, 2 Mar 2017 13:01:32 +0100
Subject: Android : improve the version number management (#46)

Add functions to make the difference between the native and the java code version.

Factor out the version management in the makefiles.
---
 android/olm-sdk/src/main/jni/Android.mk | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'android/olm-sdk/src/main/jni')

diff --git a/android/olm-sdk/src/main/jni/Android.mk b/android/olm-sdk/src/main/jni/Android.mk
index 97d747c..c51553c 100644
--- a/android/olm-sdk/src/main/jni/Android.mk
+++ b/android/olm-sdk/src/main/jni/Android.mk
@@ -1,11 +1,11 @@
 LOCAL_PATH := $(call my-dir)
 include $(CLEAR_VARS)
 
-LOCAL_MODULE := olm
-MAJOR := 2
-MINOR := 0
-PATCH := 0
+include ../../../../common.mk
 OLM_VERSION := $(MAJOR).$(MINOR).$(PATCH)
+
+LOCAL_MODULE := olm
+
 SRC_ROOT_DIR := ../../../../..
 
 $(info LOCAL_PATH=$(LOCAL_PATH))
-- 
cgit v1.2.3