Merge master to cloud-interface branch

[platform/upstream/iotivity.git] / service / resource-encapsulation / src / resourceContainer / SConscript

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