Fix for compilation errors in Android EasySetup
authorlankamadan <lanka.madan@samsung.com>
Fri, 28 Aug 2015 04:26:27 +0000 (13:26 +0900)
committerMadan Lanka <lanka.madan@samsung.com>
Fri, 28 Aug 2015 04:51:25 +0000 (04:51 +0000)
commitc313f193839da87b52c9e9ce8dc97011f2c5398b
treef9c918e1130f35fc5270be183e3bf2cc49e7df22
parent068b9d878cead4b54ceaba89cb9d9c19b1c5dcb1
Fix for compilation errors in Android EasySetup

Fixed OCConnectivity Type in Android Easy Setup Code based on latest master branch changes.

Change-Id: I4d7e0e207c152e6596a817704edf35957dec6e07
Signed-off-by: Madan Lanka <lanka.madan@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2308
resource/csdk/connectivity/SConscript
resource/csdk/connectivity/samples/android/casample/settings.gradle [changed mode: 0755->0644]
service/SConscript
service/easy-setup/sampleapp/android/EasySetup/app/src/main/java/org/iotivity/service/easysetup/MainActivity.java
service/easy-setup/sdk/mediator/android/EasySetupCore/src/main/java/org/iotivity/service/easysetup/mediator/OnBoardEnrollee.java
service/easy-setup/sdk/mediator/android/EasySetupCore/src/main/java/org/iotivity/service/easysetup/mediator/ProvisionEnrollee.java
service/easy-setup/sdk/mediator/android/EasySetupCore/src/main/java/org/iotivity/service/easysetup/mediator/common/EnrolleeDeviceFactory.java
service/easy-setup/sdk/mediator/android/EasySetupCore/src/main/java/org/iotivity/service/easysetup/mediator/ip/WiFiSoftAPManager.java
service/easy-setup/sdk/mediator/android/jni/jni_easy_setup.cpp