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 4369fb6648d407f70d0b33cc4a8ceedb6a8ed7af..42f87890f130d6085195748411f4c91a6e1a451f 100644 (file)
--- 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 7e8c44f3388642fb07f192610ddc9e3b8d30d383..70fd94eab2187defa0198ddaf8e5463c23a0afd8 100644 (file)
--- 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");
     }