fix crash issue related resource directory in android.
authorjihwan.seo <jihwan.seo@samsung.com>
Fri, 4 Nov 2016 07:29:13 +0000 (16:29 +0900)
committerHabib Virji <habib.virji@samsung.com>
Fri, 4 Nov 2016 09:41:29 +0000 (09:41 +0000)
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>
android/android_api/base/jni/Android.mk

index aabb512..c7e940b 100644 (file)
@@ -32,6 +32,12 @@ LOCAL_MODULE := libandroid-ca
 LOCAL_SRC_FILES := $(OIC_LIB_PATH)/libconnectivity_abstraction.so\r
 include $(PREBUILT_SHARED_LIBRARY)\r
 \r
+include $(CLEAR_VARS)\r
+OIC_LIB_PATH := ../../../../out/android/$(APP_ABI)/$(APP_OPTIM)\r
+LOCAL_MODULE := libandroid-rd\r
+LOCAL_SRC_FILES := $(OIC_LIB_PATH)/libresource_directory.so\r
+include $(PREBUILT_SHARED_LIBRARY)\r
+\r
 ifeq ($(SECURED), 1)\r
 include $(CLEAR_VARS)\r
 OIC_LIB_PATH := ../../../../out/android/$(APP_ABI)/$(APP_OPTIM)\r
@@ -144,6 +150,7 @@ LOCAL_STATIC_LIBRARIES += android-coap
 LOCAL_STATIC_LIBRARIES += android-oc_logger\r
 LOCAL_STATIC_LIBRARIES += android-ca\r
 LOCAL_STATIC_LIBRARIES += android_cpp11_compat\r
+LOCAL_STATIC_LIBRARIES += android-rd\r
 ifeq ($(SECURED), 1)\r
 LOCAL_STATIC_LIBRARIES += android-ocprovision\r
 LOCAL_STATIC_LIBRARIES += android-ocpmapi\r