android: Use octimer from common lib

As "extlibs/timer" has been integrated into internal common lib,
It should not be used anymore

Bug: https://jira.iotivity.org/browse/IOT-1889
Change-Id: I458f1a8051c2db742d6fbc46ff7550a7fa962f71
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/18903
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: Dave Thaler <dthaler@microsoft.com>
Reviewed-by: Rick Bell <richard.s.bell@intel.com>

diff --git a/service/easy-setup/mediator/richsdk/android/EasySetupCore/src/main/jni/Android.mk b/service/easy-setup/mediator/richsdk/android/EasySetupCore/src/main/jni/Android.mk
index e158ce8..d3b42dc 100755 (executable)
--- a/service/easy-setup/mediator/richsdk/android/EasySetupCore/src/main/jni/Android.mk
+++ b/service/easy-setup/mediator/richsdk/android/EasySetupCore/src/main/jni/Android.mk
@@ -85,7 +85,6 @@ LOCAL_C_INCLUDES := $(LOCAL_PATH) \
                                        $(LOCAL_PATH)/../../../../../../../../../resource/csdk/security/provisioning/include/oxm \
                                        $(LOCAL_PATH)/../../../../../../../../../extlibs/cjson \
                                        $(LOCAL_PATH)/../../../../../../../../../extlibs/boost/boost_1_58_0 \
-                                       $(LOCAL_PATH)/../../../../../../../../../extlibs/timer \
                                        $(LOCAL_PATH)/../../../../../../../../../java/jni \
 
 LOCAL_SRC_FILES += $(patsubst $(LOCAL_PATH)/%, %, $(wildcard $(LOCAL_PATH)/*.cpp))