Merge remote-tracking branch 'origin/master' into notification-service

[platform/upstream/iotivity.git] / service / easy-setup / Build_Instructions_Android_Arduino.txt

diff --git a/service/easy-setup/Build_Instructions_Android_Arduino.txt b/service/easy-setup/Build_Instructions_Android_Arduino.txt
index b54f354..e6081fa 100644 (file)
--- a/service/easy-setup/Build_Instructions_Android_Arduino.txt
+++ b/service/easy-setup/Build_Instructions_Android_Arduino.txt
@@ -43,8 +43,7 @@ Steps to build and deploy Easysetup Mediator in Android platform
         export ANDROID_NDK=<ANDROID_NDK>
 
     a) In the IoTivity root source folder execute
-         scons TARGET_OS=android TARGET_ARCH=armeabi TARGET_TRANSPORT=IP ES_ROLE=mediator ES_TARGET_ENROLLEE={Platform} RELEASE=0
-                Note : {Platform} can be -> arduino , linux, tizen
+         scons TARGET_OS=android TARGET_ARCH=armeabi TARGET_TRANSPORT=IP RELEASE=0
 
     b) If the project is setup correctly, you should see a BUILD SUCCESSFUL message on the terminal
         You should see the .aar files generated inside of '<iotivity>/android/android_api/base/build/outputs/aar' directory. The .aar files contain jni directory and also a .jar file
@@ -58,6 +57,12 @@ Steps to build and deploy Easysetup Mediator in Android platform
     e) Step (d) will generate cross compiled Easysetup JNI .so files in the following folder
        <iotivity>/service/easy-setup/mediator/richsdk/android/libs/armeabi
 
+NOTE: If you are going to use the SECURITY feature :
+
+      (a) please remove the "oic_svr_db_client.dat" file from the application (EasySetup/app/src/main/assets/)
+
+      (b) Copy the same file in the same folder from : <iotivity>/resource/csdk/security/provisioning/sample/oic_svr_db_client.dat
+
 2) Compilation using Android Studio
 
     0) Prerequisite for running the Android application
@@ -115,7 +120,7 @@ Steps to build and deploy Easysetup Mediator in Arduino platform
 
        Possible values for <transport> are: [Only ip is currently supported]
         -> IP :
-        $ scons service TARGET_OS=arduino BOARD=arduino_due_x_dbg TARGET_ARCH=arm SHIELD=WIFI ES_ROLE=enrollee RELEASE=0
+        $ scons service TARGET_OS=arduino BOARD=arduino_due_x_dbg TARGET_ARCH=arm SHIELD=WIFI RELEASE=0
         -> BLE :
         $ scons service TARGET_OS=arduino BOARD=arduino_due_x_dbg TARGET_ARCH=arm SHIELD=BLE RELEASE=0 [Currently not supporting]