Modify <iotivity>/service/SConscript file to build PPM for Android platform

Modify PPM Android Sampleapplication jni Android.mk file for latest code

Change-Id: Ibadff3f2589cad9c7e33167f5beffac295db9941
Signed-off-by: YounghyunJoo <yh_.joo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1086
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>

diff --git a/service/SConscript b/service/SConscript
index b2a827e..a3bd70e 100644 (file)
--- a/service/SConscript
+++ b/service/SConscript
@@ -35,7 +35,7 @@ if target_os not in ['arduino','darwin','ios']:
 
        # Build protocol plugin project
        # protocol-plugin use 'inotify', this feature isn't support by MAC OSX
-       if target_os not in ['darwin', 'ios', 'android']:
+       if target_os not in ['darwin', 'ios']:
                SConscript('protocol-plugin/SConscript')
 
        # Build notification manager project

diff --git a/service/protocol-plugin/plugin-manager/src/Android/jni/Android.mk b/service/protocol-plugin/plugin-manager/src/Android/jni/Android.mk
index 9e4f004..9bf9102 100644 (file)
--- a/service/protocol-plugin/plugin-manager/src/Android/jni/Android.mk
+++ b/service/protocol-plugin/plugin-manager/src/Android/jni/Android.mk
@@ -2,17 +2,17 @@ LOCAL_PATH:=$(call my-dir)
 
 include $(CLEAR_VARS)
 LOCAL_MODULE   := libexpat
-LOCAL_SRC_FILES        := ../../../../../../deps/android/lib/armeabi/libexpat.so
+LOCAL_SRC_FILES        := ../../../../../../dep/android/armeabi/usr/lib/libexpat.so
 include $(PREBUILT_SHARED_LIBRARY)
 
 include $(CLEAR_VARS)
 LOCAL_MODULE   := libboost_thread
-LOCAL_SRC_FILES        := ../../../../../../deps/android/lib/armeabi/libboost_thread.a
+LOCAL_SRC_FILES        := ../../../../../../dep/android/armeabi/usr/lib/libboost_thread.a
 include $(PREBUILT_STATIC_LIBRARY)
 
 include $(CLEAR_VARS)
 LOCAL_MODULE   := libboost_system
-LOCAL_SRC_FILES        := ../../../../../../deps/android/lib/armeabi/libboost_system.a
+LOCAL_SRC_FILES        := ../../../../../../dep/android/armeabi/usr/lib/libboost_system.a
 include $(PREBUILT_STATIC_LIBRARY)
 
 include $(CLEAR_VARS)
@@ -39,7 +39,7 @@ LOCAL_STATIC_LIBRARIES                += libboost_thread
 LOCAL_STATIC_LIBRARIES         += libboost_system
 LOCAL_STATIC_LIBRARIES         += libexpat
 
-LOCAL_C_INCLUDES                       := ../../../../../../extlibs/boost/boost_1_57_0
+LOCAL_C_INCLUDES                       := ../../../../../../extlibs/boost/boost_1_58_0
 LOCAL_C_INCLUDES                       += ../../../../lib/cpluff/libcpluff
 LOCAL_C_INCLUDES                       += ../../../src
 LOCAL_C_INCLUDES                       += ../../../../../../extlibs/rapidxml