From 55560f6d978aa3feeebe52bb8c326dcc6315fc11 Mon Sep 17 00:00:00 2001 From: George Nash Date: Tue, 13 Dec 2016 10:09:10 -0800 Subject: [PATCH] [IOT-1089] Fixed paths in gradle build files Change-Id: I15261d813de636c1ed9dec6bed7a5e0392897924 Signed-off-by: George Nash Reviewed-on: https://gerrit.iotivity.org/gerrit/15571 Tested-by: jenkins-iotivity Reviewed-by: Larry Sachs Reviewed-by: Rick Bell --- java/examples-android/DirectPairing/build.gradle | 76 +++++++++++----------- .../cloudprovisioningclient/build.gradle | 2 +- 2 files changed, 39 insertions(+), 39 deletions(-) diff --git a/java/examples-android/DirectPairing/build.gradle b/java/examples-android/DirectPairing/build.gradle index 8499e31..74e56ab 100644 --- a/java/examples-android/DirectPairing/build.gradle +++ b/java/examples-android/DirectPairing/build.gradle @@ -1,38 +1,38 @@ -apply plugin: 'com.android.application' - -android { - compileSdkVersion 21 - buildToolsVersion "20.0.0" - - defaultConfig { - applicationId "org.iotivity.base.examples.DirectPairing" - minSdkVersion 21 - targetSdkVersion 21 - versionCode 1 - versionName "1.0" - } - buildTypes { - release { - minifyEnabled false - proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' - } - } - lintOptions { - abortOnError false - } -} -repositories { - flatDir { - dirs "../../android_api/base/build/outputs/aar/" - } -} - -try { - dependencies { - compile ":iotivity-base-${TARGET_ARCH}-${RELEASE}@aar" - } -} catch (all) { - print "${ERROR_MSG}" - assert all -} - +apply plugin: 'com.android.application' + +android { + compileSdkVersion 21 + buildToolsVersion "20.0.0" + + defaultConfig { + applicationId "org.iotivity.base.examples.DirectPairing" + minSdkVersion 21 + targetSdkVersion 21 + versionCode 1 + versionName "1.0" + } + buildTypes { + release { + minifyEnabled false + proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' + } + } + lintOptions { + abortOnError false + } +} +repositories { + flatDir { + dirs "../../iotivity-android/build/outputs/aar/" + } +} + +try { + dependencies { + compile ":iotivity-base-${TARGET_ARCH}-${RELEASE}@aar" + } +} catch (all) { + print "${ERROR_MSG}" + assert all +} + diff --git a/java/examples-android/cloudprovisioningclient/build.gradle b/java/examples-android/cloudprovisioningclient/build.gradle index 4e2bb4b..3aca328 100755 --- a/java/examples-android/cloudprovisioningclient/build.gradle +++ b/java/examples-android/cloudprovisioningclient/build.gradle @@ -23,7 +23,7 @@ android { } repositories { flatDir { - dirs "../../android_api/base/build/outputs/aar/" + dirs "../../iotivity-android/build/outputs/aar/" } } -- 2.7.4