From: coderhyme <jhyo.kim@samsung.com>
Date: Thu, 1 Oct 2015 10:25:15 +0000 (-0700)
Subject: Fix an issue of resource-encapsulation android regarding loading native libs
X-Git-Tag: 1.2.0+RC1~967
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b0561c06cdcaa5ce4a7b480988ef283307559d71;p=platform%2Fupstream%2Fiotivity.git

Fix an issue of resource-encapsulation android regarding loading native libs

Loading ResourceContainer native lib make the aar can't be loaded because android re doesn't contain it.

Change-Id: I9ff82a2248b514bb305cb746a3820d7ee45ebe5f
Signed-off-by: coderhyme <jhyo.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3365
Reviewed-by: Markus Jung <markus.jung@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
---

diff --git a/service/resource-encapsulation/android/service/src/main/java/org/iotivity/service/RcsObject.java b/service/resource-encapsulation/android/service/src/main/java/org/iotivity/service/RcsObject.java
index 4369fb6..42f8789 100644
--- a/service/resource-encapsulation/android/service/src/main/java/org/iotivity/service/RcsObject.java
+++ b/service/resource-encapsulation/android/service/src/main/java/org/iotivity/service/RcsObject.java
@@ -30,7 +30,6 @@ public class RcsObject {
         System.loadLibrary("rcs_client");
         System.loadLibrary("rcs_server");
         System.loadLibrary("rcs_common");
-        System.loadLibrary("rcs_container");
         System.loadLibrary("rcs_jni");
     }
 
diff --git a/service/resource-encapsulation/android/service/src/main/java/org/iotivity/service/client/RcsDiscoveryManager.java b/service/resource-encapsulation/android/service/src/main/java/org/iotivity/service/client/RcsDiscoveryManager.java
index 7e8c44f..70fd94e 100644
--- a/service/resource-encapsulation/android/service/src/main/java/org/iotivity/service/client/RcsDiscoveryManager.java
+++ b/service/resource-encapsulation/android/service/src/main/java/org/iotivity/service/client/RcsDiscoveryManager.java
@@ -41,7 +41,6 @@ public final class RcsDiscoveryManager {
         System.loadLibrary("rcs_client");
         System.loadLibrary("rcs_server");
         System.loadLibrary("rcs_common");
-        System.loadLibrary("rcs_container");
         System.loadLibrary("rcs_jni");
     }