Commit 8f9ef44e authored by YounghyunJoo's avatar YounghyunJoo Committed by Uze Choi

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

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

Change-Id: Idbd3f91cd4c52d466770e0d05d9db72f12ec5691
Signed-off-by: default avatarYounghyunJoo <yh_.joo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1088Reviewed-by: default avatarUze Choi <uzchoi@samsung.com>
Tested-by: default avatarUze Choi <uzchoi@samsung.com>
parent 913c247a
......@@ -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
......
......@@ -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
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment