Merge branch 'master' into notification-service 69/9269/1
authoruzchoi <uzchoi@samsung.com>
Mon, 11 Jul 2016 02:39:29 +0000 (11:39 +0900)
committeruzchoi <uzchoi@samsung.com>
Mon, 11 Jul 2016 02:43:44 +0000 (11:43 +0900)
Change-Id: I968cfa282e3ef1e3132ea0fbe93a7098115c7193
Signed-off-by: uzchoi <uzchoi@samsung.com>
1  2 
.gitignore
service/SConscript

diff --combined .gitignore
@@@ -49,11 -49,6 +49,11 @@@ service/things-manager/build/linux/rele
  service/things-manager/build/linux/debug
  service/things-manager/sdk/build/linux/
  
 +service/notification/android/.gradle/
 +service/notification/android/build/
 +service/notification/android/notification-service/build/
 +service/notification/android/notification-service/src/main/obj/
 +
  # Ignore any object files
  *.o
  *.os
@@@ -89,7 -84,6 +89,7 @@@ config.lo
  os
  out/
  platform
 +iotivity.pc
  
  # Ignore downloaded dependencies
  extlibs/gtest/gtest-*
@@@ -103,7 -97,7 +103,7 @@@ extlibs/android/sdk/android-sdk_r24.
  extlibs/android/sdk/android-sdk-linux
  extlibs/android/sdk/android-sdk-macosx
  extlibs/android/sdk/android-sdk-windows
- extlibs/boost/boost_1_58_0
+ extlibs/boost/*
  extlibs/tinycbor/tinycbor
  *.tgz
  *.zip
@@@ -117,9 -111,6 +117,9 @@@ extlibs/bluez/blue
  *~
  *#*#
  *.orig
 +.cproject
 +.gradle/
 +.project
  
  # Ignore byte-compiled Python scripts
  *.pyc
diff --combined service/SConscript
@@@ -26,7 -26,7 +26,7 @@@ Import('env'
  
  target_os = env.get('TARGET_OS')
  
- if target_os not in ['arduino','darwin', 'ios']:
+ if target_os not in ['arduino','darwin', 'ios', 'windows']:
      # Build things manager project
      SConscript('things-manager/SConscript')
  
      if target_os in ['linux']:
          SConscript('scene-manager/SConscript')
  
 +    if target_os in ['linux','android']:
 +        SConscript('notification/SConscript')
 +
      # Build simulator module
      if target_os in ['linux'] and env.get('SIMULATOR', False):
          SConscript('simulator/SConscript')
  
    # Build resource directory project
    if env.get('WITH_RD') == '1':
-         SConscript('resource-directory/SConscript')
+ # Build resource directory project
+ if env.get('WITH_RD') == '1':
+     SConscript('resource-directory/SConscript')
  
  # Build EasySetup module
  if target_os in ['arduino', 'android', 'linux','tizen']: