From: jihwan.seo <jihwan.seo@samsung.com>
Date: Fri, 4 Nov 2016 07:29:13 +0000 (+0900)
Subject: fix crash issue related resource directory in android.
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f9d1d75e2d89fad0c96787e67c29a9ba8ec27363;p=contrib%2Fiotivity.git

fix crash issue related resource directory in android.

there was some unsatisfiedLinkError issue of RD library.
after merge https://gerrit.iotivity.org/gerrit/#/c/13657/

Change-Id: Ib9f9fc3e14200cc9f1e97b6d04ef71fa27f7499f
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14025
Reviewed-by: Jaewook Jung <jw0213.jung@samsung.com>
Reviewed-by: Hyuna Jo <hyuna0213.jo@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Habib Virji <habib.virji@samsung.com>
---

diff --git a/android/android_api/base/jni/Android.mk b/android/android_api/base/jni/Android.mk
index aabb512..c7e940b 100644
--- a/android/android_api/base/jni/Android.mk
+++ b/android/android_api/base/jni/Android.mk
@@ -32,6 +32,12 @@ LOCAL_MODULE := libandroid-ca
 LOCAL_SRC_FILES := $(OIC_LIB_PATH)/libconnectivity_abstraction.so
 include $(PREBUILT_SHARED_LIBRARY)
 
+include $(CLEAR_VARS)
+OIC_LIB_PATH := ../../../../out/android/$(APP_ABI)/$(APP_OPTIM)
+LOCAL_MODULE := libandroid-rd
+LOCAL_SRC_FILES := $(OIC_LIB_PATH)/libresource_directory.so
+include $(PREBUILT_SHARED_LIBRARY)
+
 ifeq ($(SECURED), 1)
 include $(CLEAR_VARS)
 OIC_LIB_PATH := ../../../../out/android/$(APP_ABI)/$(APP_OPTIM)
@@ -144,6 +150,7 @@ LOCAL_STATIC_LIBRARIES += android-coap
 LOCAL_STATIC_LIBRARIES += android-oc_logger
 LOCAL_STATIC_LIBRARIES += android-ca
 LOCAL_STATIC_LIBRARIES += android_cpp11_compat
+LOCAL_STATIC_LIBRARIES += android-rd
 ifeq ($(SECURED), 1)
 LOCAL_STATIC_LIBRARIES += android-ocprovision
 LOCAL_STATIC_LIBRARIES += android-ocpmapi