From b0561c06cdcaa5ce4a7b480988ef283307559d71 Mon Sep 17 00:00:00 2001 From: coderhyme Date: Thu, 1 Oct 2015 03:25:15 -0700 Subject: [PATCH] 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 Reviewed-on: https://gerrit.iotivity.org/gerrit/3365 Reviewed-by: Markus Jung Tested-by: jenkins-iotivity Reviewed-by: Uze Choi --- .../android/service/src/main/java/org/iotivity/service/RcsObject.java | 1 - .../src/main/java/org/iotivity/service/client/RcsDiscoveryManager.java | 1 - 2 files changed, 2 deletions(-) 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"); } -- 2.7.4