From 20aeee720d1c43b79810838eaa3abc15a6ec3ee0 Mon Sep 17 00:00:00 2001 From: Jihun Ha Date: Wed, 7 Sep 2016 22:46:40 +0900 Subject: [PATCH] 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 Reviewed-on: https://gerrit.iotivity.org/gerrit/11515 Reviewed-by: Phil Coval Reviewed-by: Uze Choi Tested-by: Uze Choi --- service/easy-setup/mediator/richsdk/android/SConscript | 1 + service/easy-setup/sampleapp/mediator/android/SConscript | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/service/easy-setup/mediator/richsdk/android/SConscript b/service/easy-setup/mediator/richsdk/android/SConscript index 7078def..551f4a4 100755 --- 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 --- 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 -- 2.7.4