[Resource Encapsulation] Enabled RE layer build for Android platform

Change-Id: Ia5091fb9e728e46e37a4f5ee8dc69e4b066db8d1
Signed-off-by: Jay Sharma <jay.sharma@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2215
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>

diff --git a/service/SConscript b/service/SConscript
index 5389725..a406ae1 100644 (file)
--- a/service/SConscript
+++ b/service/SConscript
@@ -43,7 +43,7 @@ if target_os not in ['arduino','darwin','ios']:
                SConscript('notification-manager/SConscript')
 
        # Build resource-encapsulation project
-       if target_os not in ['android', 'tizen']:
+       if target_os not in ['tizen']:
                SConscript('resource-encapsulation/SConscript')
 #else:
 #      SConscript('notification-manager/SampleApp/arduino/SConscript')

diff --git a/service/resource-encapsulation/SConscript b/service/resource-encapsulation/SConscript
index bf0ad09..022feff 100644 (file)
--- a/service/resource-encapsulation/SConscript
+++ b/service/resource-encapsulation/SConscript
@@ -60,7 +60,7 @@ resourceClient_env.AppendUnique(CPPPATH = [
     'src/resourceCache/include'
 ])
 
-resourceClient_env.PrependUnique(LIBS = ['oc', 'rcs_common', 'octbstack', 'gnustl_shared','oc_logger', 'compatibility', 'log'])
+resourceClient_env.PrependUnique(LIBS = ['oc', 'rcs_common', 'octbstack','oc_logger'])
 
 if target_os not in ['windows', 'winrt']:
     resourceClient_env.AppendUnique(CXXFLAGS = ['-O2', '-g', '-Wall', '-fmessage-length=0', '-std=c++0x'])
@@ -69,7 +69,7 @@ if target_os == 'linux':
 
 if target_os == 'android':
     resourceClient_env.AppendUnique(CXXFLAGS = ['-frtti', '-fexceptions'])
-    resourceClient_env.PrependUnique(LIBS = ['gnustl_shared', 'compatibility', 'log'])
+    resourceClient_env.PrependUnique(LIBS = ['gnustl_shared', 'log'])
 
 resourceClient_env.AppendUnique(LIBS = ['dl'])
 
@@ -90,8 +90,11 @@ client_src = [
         RESOURCECLIENT_DIR + 'RCSDiscoveryManager.cpp',
         RESOURCECLIENT_DIR + 'RCSRemoteResourceObject.cpp'
                ]
-ResourceClientsdk = resourceClient_env.StaticLibrary('rcs_client', client_src)
-resourceClient_env.InstallTarget(ResourceClientsdk , 'librcs_client')
+ResourceClientsdk_static = resourceClient_env.StaticLibrary('rcs_client', client_src)
+ResourceClientsdk_shared = resourceClient_env.SharedLibrary('rcs_client', client_src)
+
+resourceClient_env.InstallTarget([ResourceClientsdk_static,ResourceClientsdk_shared], 'librcs_client')
+resourceClient_env.UserInstallTargetLib([ResourceClientsdk_static,ResourceClientsdk_shared], 'librcs_client')
 
 ######################################################################
 # Build Sample App: SampleResourceClient & SampleResourceServer
@@ -101,7 +104,8 @@ SConscript('examples/SConscript')
 ######################################################################
 # Build UnitTests Resource Client , resourceCache and resourceBroker
 ################################################ ######################
-SConscript('unittests/SConscript')
-SConscript('src/resourceCache/unittests/SConscript')
-SConscript('src/resourceBroker/unittest/SConscript')
+if target_os == 'linux':
+    SConscript('unittests/SConscript')
+    SConscript('src/resourceCache/unittests/SConscript')
+    SConscript('src/resourceBroker/unittest/SConscript')
 

diff --git a/service/resource-encapsulation/src/common/SConscript b/service/resource-encapsulation/src/common/SConscript
index fd10311..e0d38be 100644 (file)
--- a/service/resource-encapsulation/src/common/SConscript
+++ b/service/resource-encapsulation/src/common/SConscript
@@ -62,7 +62,7 @@ if target_os not in ['darwin', 'ios', 'windows', 'winrt']:
 
 if target_os == 'android':
     rcs_common_env.AppendUnique(CXXFLAGS = ['-frtti', '-fexceptions'])
-    rcs_common_env.PrependUnique(LIBS = ['gnustl_shared', 'compatibility', 'log'])
+    rcs_common_env.PrependUnique(LIBS = ['gnustl_shared', 'log'])
 
 rcs_common_env.AppendUnique(LIBS = ['dl', 'oc'])
 
@@ -91,42 +91,41 @@ rcs_common_shared = rcs_common_env.SharedLibrary('rcs_common', rcs_common_src)
 rcs_common_env.InstallTarget([rcs_common_static,rcs_common_shared], 'rcs_common')
 
 ######################################################################
-# Build Test primitive Resource
+# Build Test Expiry Timer and primitive Resource
 ######################################################################
-rcs_common_test_env = rcs_common_env.Clone();
-
-rcs_common_test_env.PrependUnique(CPPPATH = [
-    env.get('SRC_DIR')+'/extlibs/hippomocks-master',
-    gtest_dir + '/include',
-    'utils/include'
-    ])
-
-gtest = File(gtest_dir + '/lib/.libs/libgtest.a')
-gtest_main = File(gtest_dir + '/lib/.libs/libgtest_main.a')
-
-rcs_common_test_env.PrependUnique(LIBS = [
-    'octbstack',
-    'oc_logger',
-    'connectivity_abstraction',
-    'coap',
-    'rcs_common',
-     gtest,
-     gtest_main,
-    'pthread'
-    ])
-
-rcs_common_test_src = [
-    env.Glob('primitiveResource/unittests/*.cpp'),
-    'expiryTimer/unittests/ExpiryTimerTest.cpp'
-    ]
-
-rcs_common_test = rcs_common_test_env.Program('rcs_common_test', rcs_common_test_src)
-Alias("rcs_common_test", rcs_common_test)
-env.AppendTarget('rcs_common_test')
-
-if env.get('TEST') == '1':
-    target_os = env.get('TARGET_OS')
-    if target_os == 'linux':
-        from tools.scons.RunTest import *
-        run_test(rcs_common_test_env, '',
-                'service/resource-encapsulation/src/common/rcs_common_test')
+if target_os == 'linux':
+       rcs_common_test_env = rcs_common_env.Clone();
+
+       rcs_common_test_env.PrependUnique(CPPPATH = [
+               env.get('SRC_DIR')+'/extlibs/hippomocks-master',
+               gtest_dir + '/include',
+               'utils/include'
+               ])
+
+       gtest = File(gtest_dir + '/lib/.libs/libgtest.a')
+       gtest_main = File(gtest_dir + '/lib/.libs/libgtest_main.a')
+
+       rcs_common_test_env.PrependUnique(LIBS = [
+               'octbstack',
+               'oc_logger',
+               'connectivity_abstraction',
+               'coap',
+               'rcs_common',
+               gtest,
+               gtest_main,
+               'pthread'
+               ])
+
+       rcs_common_test_src = [
+               env.Glob('primitiveResource/unittests/*.cpp'),
+               'expiryTimer/unittests/ExpiryTimerTest.cpp'
+               ]
+
+       rcs_common_test = rcs_common_test_env.Program('rcs_common_test', rcs_common_test_src)
+       Alias("rcs_common_test", rcs_common_test)
+       env.AppendTarget('rcs_common_test')
+
+       if env.get('TEST') == '1':
+               from tools.scons.RunTest import *
+               run_test(rcs_common_test_env, '',
+                       'service/resource-encapsulation/src/common/rcs_common_test')

diff --git a/service/resource-encapsulation/src/resourceContainer/SConscript b/service/resource-encapsulation/src/resourceContainer/SConscript
index 6bf95d1..2934a06 100644 (file)
--- a/service/resource-encapsulation/src/resourceContainer/SConscript
+++ b/service/resource-encapsulation/src/resourceContainer/SConscript
@@ -93,7 +93,7 @@ if target_os not in ['darwin', 'ios', 'windows', 'winrt']:
 
 if target_os == 'android':
     resource_container_env.AppendUnique(CXXFLAGS = ['-frtti', '-fexceptions'])
-    resource_container_env.PrependUnique(LIBS = ['gnustl_shared', 'compatibility', 'log'])
+    resource_container_env.PrependUnique(LIBS = ['gnustl_shared', 'log'])
 
 try:
        resource_container_env.AppendUnique(LIBPATH = [os.environ['JAVA_LIB']])
@@ -127,24 +127,24 @@ resource_container_env.InstallTarget([res_container_static,res_container_shared]
 ######################################################################
 # build soft sensor sample bundle
 ######################################################################
+if target_os == 'linux':
+       ss_resource_bundle_env = resource_container_env.Clone()
+       ss_resource_bundle_env.AppendUnique(CCFLAGS = ['-fPIC'])
+
+       SS_RESOURCE_BUNDLE_DIR = 'examples/SoftSensorSampleBundle/'
+       ss_resource_bundle_env.AppendUnique(CPPPATH = [
+                       SS_RESOURCE_BUNDLE_DIR + 'include',
+                       'include/',
+                       '../../include',
+                       ])
 
-ss_resource_bundle_env = resource_container_env.Clone()
-ss_resource_bundle_env.AppendUnique(CCFLAGS = ['-fPIC'])
-
-SS_RESOURCE_BUNDLE_DIR = 'examples/SoftSensorSampleBundle/'
-ss_resource_bundle_env.AppendUnique(CPPPATH = [
-               SS_RESOURCE_BUNDLE_DIR + 'include',
-               'include/',
-               '../../include',
-               ])
-
-ss_resource_bundle_env.PrependUnique(LIBS = ['rcs_container'])
-
-ss_resource_bundle_src = [ Glob(SS_RESOURCE_BUNDLE_DIR + 'src/*.cpp')]
+       ss_resource_bundle_env.PrependUnique(LIBS = ['rcs_container'])
 
-SoftSensorBundle = ss_resource_bundle_env.SharedLibrary('SoftSensorBundle', ss_resource_bundle_src)
-ss_resource_bundle_env.InstallTarget(SoftSensorBundle, 'libSoftSensorBundle')
+       ss_resource_bundle_src = [ Glob(SS_RESOURCE_BUNDLE_DIR + 'src/*.cpp')]
 
+       SoftSensorBundle = ss_resource_bundle_env.SharedLibrary('SoftSensorBundle', ss_resource_bundle_src)
+       ss_resource_bundle_env.InstallTarget(SoftSensorBundle, 'libSoftSensorBundle')
+       
 ######################################################################
 # build hue sample bundle
 ######################################################################
@@ -182,7 +182,8 @@ else:
 ######################################################################
 # build resource container unit tests
 ######################################################################
-SConscript('unittests/SConscript')
+if target_os == 'linux':
+       SConscript('unittests/SConscript')
 
 ######################################################################
 # Build Container Sample

diff --git a/service/resource-encapsulation/src/resourceContainer/src/ResourceContainerImpl.cpp b/service/resource-encapsulation/src/resourceContainer/src/ResourceContainerImpl.cpp
index 25164cf..f4dd364 100644 (file)
--- a/service/resource-encapsulation/src/resourceContainer/src/ResourceContainerImpl.cpp
+++ b/service/resource-encapsulation/src/resourceContainer/src/ResourceContainerImpl.cpp
@@ -252,7 +252,7 @@ namespace OIC
             void *bundleHandle = m_bundles[id]->getBundleHandle();
             info_logger() << "Unregister bundle: " << m_bundles[id]->getID() << ", "
                           << m_bundles[id]->getID() << endl;
-            char *error;
+            const char *error;
             dlclose(bundleHandle);
             if ((error = dlerror()) != NULL)
             {
@@ -551,7 +551,7 @@ namespace OIC
 
         void ResourceContainerImpl::registerSoBundle(RCSBundleInfo *bundleInfo)
         {
-            char *error;
+            const char *error;
 
             activator_t *bundleActivator = NULL;
             deactivator_t *bundleDeactivator = NULL;

diff --git a/service/resource-encapsulation/src/serverBuilder/SConscript b/service/resource-encapsulation/src/serverBuilder/SConscript
index c0aa20a..1ec21b7 100644 (file)
--- a/service/resource-encapsulation/src/serverBuilder/SConscript
+++ b/service/resource-encapsulation/src/serverBuilder/SConscript
@@ -60,7 +60,7 @@ if target_os not in ['darwin', 'ios', 'windows', 'winrt']:
 
 if target_os == 'android':
     server_builder_env.AppendUnique(CXXFLAGS = ['-frtti', '-fexceptions'])
-    server_builder_env.PrependUnique(LIBS = ['gnustl_shared', 'compatibility', 'log'])
+    server_builder_env.PrependUnique(LIBS = ['gnustl_shared', 'log'])
 
 server_builder_env.AppendUnique(LIBS = ['dl', 'oc', 'rcs_common'])
 
@@ -84,37 +84,36 @@ server_builder_env.InstallTarget([server_builder_static, server_builder_shared],
 ######################################################################
 # Build Test
 ######################################################################
-server_builder_test_env = server_builder_env.Clone();
-
-server_builder_test_env.AppendUnique(CPPPATH = [
-    env.get('SRC_DIR')+'/extlibs/hippomocks-master',
-    gtest_dir + '/include',
-    '../common/utils/include'
-    ])
-
-gtest = File(gtest_dir + '/lib/.libs/libgtest.a')
-gtest_main = File(gtest_dir + '/lib/.libs/libgtest_main.a')
-
-server_builder_test_env.PrependUnique(LIBS = [
-    'rcs_server',
-    'octbstack',
-    'oc_logger',
-    'connectivity_abstraction',
-    'coap',
-    gtest,
-    gtest_main,
-    'pthread',
-    ])
-
-server_builder_test_src = env.Glob('unittests/*.cpp')
-
-server_builder_test = server_builder_test_env.Program('rcs_server_test', server_builder_test_src)
-Alias("rcs_server_test", server_builder_test)
-env.AppendTarget('rcs_server_test')
-
-if env.get('TEST') == '1':
-    target_os = env.get('TARGET_OS')
-    if target_os == 'linux':
-        from tools.scons.RunTest import *
-        run_test(server_builder_test_env, '',
-                'service/resource-encapsulation/src/serverBuilder/rcs_server_test')
\ No newline at end of file
+if target_os == 'linux':
+       server_builder_test_env = server_builder_env.Clone();
+
+       server_builder_test_env.AppendUnique(CPPPATH = [
+               env.get('SRC_DIR')+'/extlibs/hippomocks-master',
+               gtest_dir + '/include',
+               '../common/utils/include'
+               ])
+
+       gtest = File(gtest_dir + '/lib/.libs/libgtest.a')
+       gtest_main = File(gtest_dir + '/lib/.libs/libgtest_main.a')
+
+       server_builder_test_env.PrependUnique(LIBS = [
+               'rcs_server',
+               'octbstack',
+               'oc_logger',
+               'connectivity_abstraction',
+               'coap',
+               gtest,
+               gtest_main,
+               'pthread',
+               ])
+
+       server_builder_test_src = env.Glob('unittests/*.cpp')
+
+       server_builder_test = server_builder_test_env.Program('rcs_server_test', server_builder_test_src)
+       Alias("rcs_server_test", server_builder_test)
+       env.AppendTarget('rcs_server_test')
+
+       if env.get('TEST') == '1':
+               from tools.scons.RunTest import *
+               run_test(server_builder_test_env, '',
+                       'service/resource-encapsulation/src/serverBuilder/rcs_server_test')