Remove resource directory dependency in lib OC
authorHabib Virji <habib.virji@samsung.com>
Fri, 11 Nov 2016 10:58:50 +0000 (10:58 +0000)
committerHabib Virji <habib.virji@samsung.com>
Sun, 13 Nov 2016 08:20:39 +0000 (08:20 +0000)
commitee6f9aa3e0dd3e01657ff0f71f9b79dcf7f1b071
tree43ff3be52973fca406bb4eb4c02bd9176fa03a8a
parentd601f9ac3572586a7c3181f159e1f9267c4c29dc
Remove resource directory dependency in lib OC

- Android code related to the resource directory is removed from OCPlatform and is in standalone file.
- In android resource-directory is linked as a shared file.
- Resource directory code in the InProcServerWrapper was creating a circular dependency and unwanted requirement
for the unit test and sample code.
- This patch fixes this dependency and moves C++ code to the resource directory.

https://jira.iotivity.org/browse/IOT-1510

Change-Id: I23423929b3000471d7fb91cb7c7bac89c3d1879b
Signed-off-by: Habib Virji <habib.virji@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14059
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Rick Bell <richard.s.bell@intel.com>
24 files changed:
android/android_api/base/jni/Android.mk
android/android_api/base/jni/JniOcPlatform.cpp
android/android_api/base/jni/JniOcPlatform.h
android/android_api/base/jni/JniOcRDClient.cpp [new file with mode: 0644]
android/android_api/base/jni/JniOcRDClient.h [new file with mode: 0644]
android/android_api/base/src/main/java/org/iotivity/base/OcPlatform.java
android/android_api/base/src/main/java/org/iotivity/base/OcRDClient.java [new file with mode: 0644]
android/examples/simplebase/src/main/java/org/iotivity/base/examples/CloudFragment.java
cloud/samples/client/airconditioner/aircon_controlee.cpp
cloud/samples/client/group_invite/group_light_share.cpp
resource/csdk/resource-directory/SConscript
resource/csdk/resource-directory/include/RDClient.h [new file with mode: 0644]
resource/csdk/resource-directory/src/RDClient.cpp [new file with mode: 0644]
resource/examples/SConscript
resource/examples/rdclient.cpp
resource/include/IServerWrapper.h
resource/include/InProcServerWrapper.h
resource/include/OCApi.h
resource/include/OCPlatform.h
resource/include/OCPlatform_impl.h
resource/src/InProcServerWrapper.cpp
resource/src/OCPlatform.cpp
resource/src/OCPlatform_impl.cpp
resource/src/SConscript