diff options
| author | Valere <bill.carson@valrsoft.com> | 2019-04-10 14:03:49 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-10 14:03:49 +0200 |
| commit | c79d9282dcb9946144905a93ec9b5f14b17cc30c (patch) | |
| tree | b167ff5e145c66bc3ebea2f9db9f04183cc1b2ea /android/olm-sdk/src/main/jni/Android.mk | |
| parent | ebc156e7c272e08e375c3e704651b179541e078b (diff) | |
| parent | eb7347bb524b830c1458d64411cd56fc58ad5b91 (diff) | |
Merge pull request #83 from matrix-org/BillCarsonFr/java_sas
Java binding for SAS
Diffstat (limited to 'android/olm-sdk/src/main/jni/Android.mk')
| -rw-r--r-- | android/olm-sdk/src/main/jni/Android.mk | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/android/olm-sdk/src/main/jni/Android.mk b/android/olm-sdk/src/main/jni/Android.mk index 0d98f69..101346b 100644 --- a/android/olm-sdk/src/main/jni/Android.mk +++ b/android/olm-sdk/src/main/jni/Android.mk @@ -41,6 +41,7 @@ $(SRC_ROOT_DIR)/src/ratchet.cpp \ $(SRC_ROOT_DIR)/src/session.cpp \ $(SRC_ROOT_DIR)/src/utility.cpp \ $(SRC_ROOT_DIR)/src/pk.cpp \ +$(SRC_ROOT_DIR)/src/sas.c \ $(SRC_ROOT_DIR)/src/ed25519.c \ $(SRC_ROOT_DIR)/src/error.c \ $(SRC_ROOT_DIR)/src/inbound_group_session.c \ @@ -57,7 +58,8 @@ olm_inbound_group_session.cpp \ olm_outbound_group_session.cpp \ olm_utility.cpp \ olm_manager.cpp \ -olm_pk.cpp +olm_pk.cpp \ +olm_sas.cpp LOCAL_LDLIBS := -llog |