aboutsummaryrefslogtreecommitdiff
path: root/android/olm-sdk/src/main/jni/Android.mk
diff options
context:
space:
mode:
authorYannick LE COLLEN <yannick@matrix.org>2017-03-02 13:01:32 +0100
committerRichard van der Hoff <github@rvanderhoff.org.uk>2017-03-02 12:01:32 +0000
commita9aeb6b5d743cc203f8e76c1a180d0cd8d433ed8 (patch)
treee877b6aa847280c35dc09d1ac44eab7f0c3eaf24 /android/olm-sdk/src/main/jni/Android.mk
parent77eaaa3d5f60b83a618ee2034e2934bd6889339d (diff)
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.
Diffstat (limited to 'android/olm-sdk/src/main/jni/Android.mk')
-rw-r--r--android/olm-sdk/src/main/jni/Android.mk8
1 files changed, 4 insertions, 4 deletions
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))