[IOT-1089] Fixed paths in gradle build files
authorGeorge Nash <george.nash@intel.com>
Tue, 13 Dec 2016 18:09:10 +0000 (10:09 -0800)
committerRick Bell <richard.s.bell@intel.com>
Tue, 13 Dec 2016 21:08:07 +0000 (21:08 +0000)
Change-Id: I15261d813de636c1ed9dec6bed7a5e0392897924
Signed-off-by: George Nash <george.nash@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15571
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Larry Sachs <larry.j.sachs@intel.com>
Reviewed-by: Rick Bell <richard.s.bell@intel.com>
java/examples-android/DirectPairing/build.gradle
java/examples-android/cloudprovisioningclient/build.gradle

index 8499e31..74e56ab 100644 (file)
@@ -1,38 +1,38 @@
-apply plugin: 'com.android.application'\r
-\r
-android {\r
-    compileSdkVersion 21\r
-    buildToolsVersion "20.0.0"\r
-\r
-    defaultConfig {\r
-        applicationId "org.iotivity.base.examples.DirectPairing"\r
-        minSdkVersion 21\r
-        targetSdkVersion 21\r
-        versionCode 1\r
-        versionName "1.0"\r
-    }\r
-    buildTypes {\r
-        release {\r
-            minifyEnabled false\r
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'\r
-        }\r
-    }\r
-    lintOptions {\r
-        abortOnError false\r
-    }\r
-}\r
-repositories {\r
-    flatDir {\r
-        dirs "../../android_api/base/build/outputs/aar/"\r
-    }\r
-}\r
-\r
-try {\r
-    dependencies {\r
-        compile ":iotivity-base-${TARGET_ARCH}-${RELEASE}@aar"\r
-    }\r
-} catch (all) {\r
-    print "${ERROR_MSG}"\r
-    assert all\r
-}\r
-\r
+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
+}
+
index 4e2bb4b..3aca328 100755 (executable)
@@ -23,7 +23,7 @@ android {
 }
 repositories {
     flatDir {
-        dirs "../../android_api/base/build/outputs/aar/"
+        dirs "../../iotivity-android/build/outputs/aar/"
     }
 }