X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=service%2Fprotocol-plugin%2Fplugin-manager%2FSConscript;h=681ab10cc992201997555f9e718126b79407caad;hb=935fdb9b67b6c10d007e652e9e2e028fd6ccfe09;hp=e15658fd7c9ec3a6fa669ac1cf34e1fc976b07ad;hpb=00b3660e45c56cb3db35dc2596a054f801b5591a;p=platform%2Fupstream%2Fiotivity.git

diff --git a/service/protocol-plugin/plugin-manager/SConscript b/service/protocol-plugin/plugin-manager/SConscript
index e15658f..681ab10 100644
--- a/service/protocol-plugin/plugin-manager/SConscript
+++ b/service/protocol-plugin/plugin-manager/SConscript
@@ -1,7 +1,7 @@
 ##
 # plugin-manager project build script
 ##
-
+import os
 Import('env')
 
 # Add third party libraries
@@ -16,16 +16,16 @@ target_os = env.get('TARGET_OS')
 plugin_manager_env.AppendUnique(CPPPATH = [
 		'../lib/cpluff/libcpluff',
 		'src',
-		'../lib/rapidxml'
+		env.get('SRC_DIR')+'/extlibs/rapidxml'
 		])
 
 if target_os not in ['windows', 'winrt']:
-	plugin_manager_env.AppendUnique(CXXFLAGS = ['-std=c++0x', '-Wall',
+	plugin_manager_env.AppendUnique(CXXFLAGS = ['-Wall','-std=c++0x',
 		'-fpermissive', '-Wsign-compare'])
 
 if target_os == 'android':
-	plugin_manager_env.AppendUnique(CXXFLAGS = ['-frtti', '-fexceptions'])
-	plugin_manager_env.AppendUnique(LIBS = ['boost_thread-gcc-mt-1_49', 'gnustl_static'])
+	plugin_manager_env.AppendUnique(CXXFLAGS = ['-frtti', '-fexceptions', '-DANDROID'])
+	plugin_manager_env.AppendUnique(LIBS = ['boost_thread', 'boost_system', 'gnustl_shared', 'log'])
 
 plugin_manager_env.AppendUnique(CPPDEFINES = ['CP_C_API=CP_EXPORT',
 					'CP_HOST=\"\\"'+env.get('TARGET_OS')+'\\"\"',
@@ -48,14 +48,20 @@ ppm = plugin_manager_env.StaticLibrary('ppm', ppm_src)
 
 pmimpl_src = [
 		'src/CpluffAdapter.cpp',
-		'src/FelixAdapter.cpp',
 		'src/Plugin.cpp',
 		'src/PluginManagerImpl.cpp',
 		'src/Config.cpp']
 
+if target_os == 'android':
+	pmimpl_src += ['src/FelixAdapter.cpp']
+
 pmimpl_env = plugin_manager_env.Clone()
 pmimpl_env.PrependUnique(CCFLAGS = ['-fPIC'])
 pmimpl_env.PrependUnique(LIBS = File(env.get('BUILD_DIR') + '/libcpluff.a'))
 pmimpl = pmimpl_env.SharedLibrary('pmimpl', pmimpl_src)
 
 plugin_manager_env.InstallTarget([ppm, pmimpl], 'libppm')
+
+# Build JNI library for android
+if env.get('TARGET_OS') == 'android':
+        SConscript('src/Android/jni/SConscript')
\ No newline at end of file