Imported Upstream version 0.9.2

[platform/upstream/iotivity.git] / service / things-manager / SConscript

diff --git a/service/things-manager/SConscript b/service/things-manager/SConscript
index 00fbf5b..73fd6ee 100644 (file)
--- a/service/things-manager/SConscript
+++ b/service/things-manager/SConscript
@@ -42,7 +42,7 @@ if target_os not in ['windows', 'winrt']:
 
 if target_os == 'android':
     things_manager_env.AppendUnique(CXXFLAGS = ['-frtti', '-fexceptions'])
-    things_manager_env.PrependUnique(LIBS = ['oc', 'octbstack', 'gnustl_shared', 'android_cpp11_compat', 'log'])
+    things_manager_env.PrependUnique(LIBS = ['oc', 'octbstack', 'gnustl_shared'])
 
 ######################################################################
 # Source files and Targets
@@ -52,6 +52,11 @@ tgmsdk_static = things_manager_env.StaticLibrary('TGMSDKLibrary', tgm_src)
 tgmsdk_shared = things_manager_env.SharedLibrary('TGMSDKLibrary', tgm_src)
 
 things_manager_env.InstallTarget([tgmsdk_static,tgmsdk_shared], 'libTGMSDK')
+things_manager_env.UserInstallTargetLib([tgmsdk_static,tgmsdk_shared], 'libTGMSDK')
+
+# Build JNI layer
+#if target_os == 'android':
+#    SConscript(os.path.join('sdk', 'java', 'jni', 'SConscript'))
 
 #Go to build sample apps
 SConscript('sampleapp/SConscript')