Add dependency to build Easy setup android application

Before building Android Mediator sample application, Easy setup SDK should
be built. This patch makes such a dependency.

Change-Id: I8e9ddbeac1f5f9a3ad12e4505de4423469b94bb5
Signed-off-by: Jihun Ha <jihun.ha@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/11515
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>

diff --git a/service/easy-setup/mediator/richsdk/android/SConscript b/service/easy-setup/mediator/richsdk/android/SConscript
index 7078def..551f4a4 100755 (executable)
--- a/service/easy-setup/mediator/richsdk/android/SConscript
+++ b/service/easy-setup/mediator/richsdk/android/SConscript
@@ -77,3 +77,4 @@ cmdBuildEasysetup=jdk_env.Gradle(target="EasySetupCore/objs",
 
 Depends(cmdBuildEasysetup, env.get('baseAAR'))
 
+env.AppendUnique(easysetupAAR = cmdBuildEasysetup)
\ No newline at end of file

diff --git a/service/easy-setup/sampleapp/mediator/android/SConscript b/service/easy-setup/sampleapp/mediator/android/SConscript
index 54d9624..021902c 100644 (file)
--- a/service/easy-setup/sampleapp/mediator/android/SConscript
+++ b/service/easy-setup/sampleapp/mediator/android/SConscript
@@ -75,4 +75,4 @@ jdk_env['BUILD_DIR'] = env.get('BUILD_DIR')
 cmdBuildEasysetupApp=jdk_env.Gradle(target="EasySetup/app/apk", 
     source="EasySetup/app/src/main/java/org/iotivity/service/easysetup/EasysetupActivity.java")
 
-Depends(cmdBuildEasysetupApp, env.get('baseAAR'))
\ No newline at end of file
+Depends(cmdBuildEasysetupApp, env.get('easysetupAAR'))
\ No newline at end of file