[Resource-Encapsulation] Fixes for Android and Tizen platform

   - Java SDK build fix.
   - Android sample Apps fix.
   - Tizen sample Apps fix.

Change-Id: Id9a2e636b2253bfed585cfcfdb9fbd2f7ca1ee75
Signed-off-by: Jay Sharma <jay.sharma@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/18779
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: JungYong KIM <jyong2.kim@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>

diff --git a/service/resource-encapsulation/android/service/src/main/jni/Android.mk b/service/resource-encapsulation/android/service/src/main/jni/Android.mk
index 8b4dd86..5b21c70 100644 (file)
--- a/service/resource-encapsulation/android/service/src/main/jni/Android.mk
+++ b/service/resource-encapsulation/android/service/src/main/jni/Android.mk
@@ -19,6 +19,11 @@ LOCAL_SRC_FILES := $(IOTIVITY_LIB_PATH)/librcs_server.so
 include $(PREBUILT_SHARED_LIBRARY)
 
 include $(CLEAR_VARS)
+LOCAL_MODULE := ca-interface
+LOCAL_SRC_FILES := $(IOTIVITY_LIB_PATH)/libca-interface.so
+include $(PREBUILT_SHARED_LIBRARY)
+
+include $(CLEAR_VARS)
 OIC_SRC_DIR := ../../../../../..
 LOCAL_MODULE := rcs_jni
 

diff --git a/service/resource-encapsulation/examples/android/RESampleClientApp/app/build.gradle b/service/resource-encapsulation/examples/android/RESampleClientApp/app/build.gradle
index 8c70e9d..765b132 100644 (file)
--- a/service/resource-encapsulation/examples/android/RESampleClientApp/app/build.gradle
+++ b/service/resource-encapsulation/examples/android/RESampleClientApp/app/build.gradle
@@ -4,6 +4,14 @@ android {
     compileSdkVersion 21
     buildToolsVersion "20.0.0"
 
+    packagingOptions {
+        pickFirst 'lib/armeabi/libca-interface.so'
+        pickFirst 'lib/armeabi-v7a/libca-interface.so'
+        pickFirst 'lib/x86/libca-interface.so'
+        pickFirst 'lib/x86_64/libca-interface.so'
+        pickFirst 'lib/arm64-v8a/libca-interface.so'
+    }
+
     defaultConfig {
         applicationId "org.iotivity.service.sample.client"
         minSdkVersion 21

diff --git a/service/resource-encapsulation/examples/android/RESampleClientApp/app/src/main/java/org/iotivity/service/sample/client/ResourceClientActivity.java b/service/resource-encapsulation/examples/android/RESampleClientApp/app/src/main/java/org/iotivity/service/sample/client/ResourceClientActivity.java
index cb1c742..bd22066 100644 (file)
--- a/service/resource-encapsulation/examples/android/RESampleClientApp/app/src/main/java/org/iotivity/service/sample/client/ResourceClientActivity.java
+++ b/service/resource-encapsulation/examples/android/RESampleClientApp/app/src/main/java/org/iotivity/service/sample/client/ResourceClientActivity.java
@@ -95,7 +95,7 @@ public class ResourceClientActivity extends Activity
             Log.i(LOG_TAG, "onStateChanged");
 
             mHandler.obtainMessage(MSG_ID_PRINT_LOG,
-                    "Current Resource State : " + resourceState);
+                   "Current Resource State : " + resourceState).sendToTarget();
         }
     };
 

diff --git a/service/resource-encapsulation/examples/android/RESampleServerApp/app/build.gradle b/service/resource-encapsulation/examples/android/RESampleServerApp/app/build.gradle
index 4b5ef9e..a7edd4d 100644 (file)
--- a/service/resource-encapsulation/examples/android/RESampleServerApp/app/build.gradle
+++ b/service/resource-encapsulation/examples/android/RESampleServerApp/app/build.gradle
@@ -4,6 +4,14 @@ android {
     compileSdkVersion 21
     buildToolsVersion "20.0.0"
 
+    packagingOptions {
+        pickFirst 'lib/armeabi/libca-interface.so'
+        pickFirst 'lib/armeabi-v7a/libca-interface.so'
+        pickFirst 'lib/x86/libca-interface.so'
+        pickFirst 'lib/x86_64/libca-interface.so'
+        pickFirst 'lib/arm64-v8a/libca-interface.so'
+    }
+
     defaultConfig {
         applicationId "org.iotivity.service.sample.server"
         minSdkVersion 21

diff --git a/service/resource-encapsulation/examples/tizen/NestedAttributeClientApp/.cproject b/service/resource-encapsulation/examples/tizen/NestedAttributeClientApp/.cproject
index fc79a18..7421a3f 100644 (file)
--- a/service/resource-encapsulation/examples/tizen/NestedAttributeClientApp/.cproject
+++ b/service/resource-encapsulation/examples/tizen/NestedAttributeClientApp/.cproject
@@ -106,6 +106,7 @@
                                                                        <listOptionValue builtIn="false" value="&quot;..\..\..\..\src\common\primitiveResource\include&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;..\..\..\..\include&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;..\..\..\..\..\..\resource\include&quot;"/>
+                                                                       <listOptionValue builtIn="false" value="&quot;..\..\..\..\..\..\resource\csdk\include&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;..\..\..\..\..\..\resource\c_common&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;..\..\..\..\..\..\resource\csdk\stack\include&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;..\..\..\..\..\..\resource\csdk\logger\include&quot;"/>
@@ -241,7 +242,6 @@
                                                                        <listOptionValue builtIn="false" value="uuid"/>
                                                                        <listOptionValue builtIn="false" value="rcs_client"/>
                                                                        <listOptionValue builtIn="false" value="rcs_common"/>
-                                                                       <listOptionValue builtIn="false" value="rcs_container"/>
                                                                        <listOptionValue builtIn="false" value="rcs_server"/>
                                                                </option>
                                                                <inputType id="cdt.managedbuild.tool.gnu.cpp.linker.input.618645708" superClass="cdt.managedbuild.tool.gnu.cpp.linker.input">

diff --git a/service/resource-encapsulation/examples/tizen/NestedAttributeClientApp/src/reclientmain.cpp b/service/resource-encapsulation/examples/tizen/NestedAttributeClientApp/src/reclientmain.cpp
index 4d3ac6c..3f04164 100644 (file)
--- a/service/resource-encapsulation/examples/tizen/NestedAttributeClientApp/src/reclientmain.cpp
+++ b/service/resource-encapsulation/examples/tizen/NestedAttributeClientApp/src/reclientmain.cpp
@@ -71,7 +71,7 @@ create_list_view(appdata_s *ad)
     // Main Menu Items Here
     elm_list_item_append(list, "Resource Client", NULL, NULL, group_cb, nf);
 
-    elm_list_item_append(list, "Resource Container", NULL, NULL, containerCreateUI, nf);
+    //elm_list_item_append(list, "Resource Container", NULL, NULL, containerCreateUI, nf);
 
     elm_list_go(list);
 

diff --git a/service/resource-encapsulation/examples/tizen/NestedAttributeServerApp/.cproject b/service/resource-encapsulation/examples/tizen/NestedAttributeServerApp/.cproject
index 61e6e5a..a1e4bc9 100644 (file)
--- a/service/resource-encapsulation/examples/tizen/NestedAttributeServerApp/.cproject
+++ b/service/resource-encapsulation/examples/tizen/NestedAttributeServerApp/.cproject
@@ -98,7 +98,6 @@
                                                                </option>
                                                                <option id="gnu.cpp.compiler.option.include.paths.1501991974" name="Include paths (-I)" superClass="gnu.cpp.compiler.option.include.paths" useByScannerDiscovery="false" valueType="includePath">
                                                                        <listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/inc}&quot;"/>
-                                                                       <listOptionValue builtIn="false" value="&quot;C:\boost_1_56_0&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;..\..\..\..\src\resourceBroker\include&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;..\..\..\..\src\resourceCache\include&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;..\..\..\..\src\common\utils\include&quot;"/>
@@ -107,6 +106,7 @@
                                                                        <listOptionValue builtIn="false" value="&quot;..\..\..\..\src\common\primitiveResource\include&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;..\..\..\..\include&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;..\..\..\..\..\..\resource\include&quot;"/>
+                                                                       <listOptionValue builtIn="false" value="&quot;..\..\..\..\..\..\resource\csdk\include&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;..\..\..\..\..\..\resource\c_common&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;..\..\..\..\..\..\resource\csdk\stack\include&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;..\..\..\..\..\..\resource\csdk\logger\include&quot;"/>
@@ -242,7 +242,6 @@
                                                                        <listOptionValue builtIn="false" value="boost_thread"/>
                                                                        <listOptionValue builtIn="false" value="rcs_client"/>
                                                                        <listOptionValue builtIn="false" value="rcs_common"/>
-                                                                       <listOptionValue builtIn="false" value="rcs_container"/>
                                                                        <listOptionValue builtIn="false" value="rcs_server"/>
                                                                </option>
                                                                <inputType id="cdt.managedbuild.tool.gnu.cpp.linker.input.618645708" superClass="cdt.managedbuild.tool.gnu.cpp.linker.input">

diff --git a/service/resource-encapsulation/examples/tizen/RESampleClientApp/.cproject b/service/resource-encapsulation/examples/tizen/RESampleClientApp/.cproject
index d9d75d7..977f697 100644 (file)
--- a/service/resource-encapsulation/examples/tizen/RESampleClientApp/.cproject
+++ b/service/resource-encapsulation/examples/tizen/RESampleClientApp/.cproject
@@ -106,6 +106,7 @@
                                              <listOptionValue builtIn="false" value="&quot;..\..\..\..\src\common\primitiveResource\include&quot;"/>
                                              <listOptionValue builtIn="false" value="&quot;..\..\..\..\include&quot;"/>
                                              <listOptionValue builtIn="false" value="&quot;..\..\..\..\..\..\resource\include&quot;"/>
+                                             <listOptionValue builtIn="false" value="&quot;..\..\..\..\..\..\resource\csdk\include&quot;"/>
                                              <listOptionValue builtIn="false" value="&quot;..\..\..\..\..\..\resource\c_common&quot;"/>
                                              <listOptionValue builtIn="false" value="&quot;..\..\..\..\..\..\resource\csdk\stack\include&quot;"/>
                                              <listOptionValue builtIn="false" value="&quot;..\..\..\..\..\..\resource\csdk\logger\include&quot;"/>

diff --git a/service/resource-encapsulation/examples/tizen/RESampleServerApp/.cproject b/service/resource-encapsulation/examples/tizen/RESampleServerApp/.cproject
index 724b1d4..eace33f 100644 (file)
--- a/service/resource-encapsulation/examples/tizen/RESampleServerApp/.cproject
+++ b/service/resource-encapsulation/examples/tizen/RESampleServerApp/.cproject
@@ -106,6 +106,7 @@
                                     <listOptionValue builtIn="false" value="&quot;..\..\..\..\src\common\primitiveResource\include&quot;"/>
                                     <listOptionValue builtIn="false" value="&quot;..\..\..\..\include&quot;"/>
                                     <listOptionValue builtIn="false" value="&quot;..\..\..\..\..\..\resource\include&quot;"/>
+                                    <listOptionValue builtIn="false" value="&quot;..\..\..\..\..\..\resource\csdk\include&quot;"/>
                                     <listOptionValue builtIn="false" value="&quot;..\..\..\..\..\..\resource\c_common&quot;"/>
                                     <listOptionValue builtIn="false" value="&quot;..\..\..\..\..\..\resource\csdk\stack\include&quot;"/>
                                     <listOptionValue builtIn="false" value="&quot;..\..\..\..\..\..\resource\csdk\logger\include&quot;"/>