Imported Upstream version 1.0.0

[platform/upstream/iotivity.git] / android / android_api / base / build.gradle

diff --git a/android/android_api/base/build.gradle b/android/android_api/base/build.gradle
index 9cbdaf8..82fb651 100755 (executable)
--- a/android/android_api/base/build.gradle
+++ b/android/android_api/base/build.gradle
@@ -25,13 +25,13 @@ apply plugin: 'com.android.library'
 android {\r
     compileSdkVersion 21\r
     buildToolsVersion "20.0.0"\r
-    archivesBaseName = "iotivity"\r
+    archivesBaseName = "iotivity-base"\r
 \r
     libraryVariants.all { variant ->\r
         variant.outputs.each { output ->\r
             def outputFile = output.outputFile\r
             if (outputFile != null && outputFile.name.endsWith('.aar')) {\r
-                def fileName = "${archivesBaseName}-${TARGET_ARCH}-${outputFile.name}"\r
+                def fileName = "${archivesBaseName}-${TARGET_ARCH}-${RELEASE}.aar"\r
                 output.outputFile = new File(outputFile.parent, fileName)\r
             }\r
         }\r
@@ -41,7 +41,7 @@ android {
         minSdkVersion 21\r
         targetSdkVersion 21\r
         versionCode 1\r
-        versionName "0.9"\r
+        versionName "1.0"\r
     }\r
     buildTypes {\r
         release {\r
@@ -50,7 +50,7 @@ android {
     }\r
 \r
     lintOptions {\r
-       abortOnError false\r
+        abortOnError false\r
     }\r
 \r
     sourceSets {\r
@@ -94,22 +94,11 @@ task buildNative(type: Exec) {
         //for windows use 'ndk-build.cmd'\r
         //def ndkBuild = new File(System.env.ANDROID_NDK_HOME, 'ndk-build.cmd')\r
         def ndkBuild = new File(System.env.ANDROID_NDK_HOME, 'ndk-build')\r
-        commandLine ndkBuild, "APP_ABI=$TARGET_ARCH", "APP_OPTIM=$RELEASE"\r
+        commandLine ndkBuild, "APP_ABI=$TARGET_ARCH", "APP_OPTIM=$RELEASE", "SECURE=$SECURED"\r
     } else {\r
         println '##################'\r
         println 'Skipping NDK build'\r
         println 'Reason: ANDROID_NDK_HOME not set.'\r
         println '##################'\r
     }\r
-}\r
-//\r
-//task (copyARR, type: Copy) {\r
-//    copy {\r
-//        from 'build/outputs/aar/'\r
-//        into '../../../out/android/'\r
-//        include '**/*.aar'\r
-//    }\r
-//}\r
-//build.finalizedBy(copyARR)\r
-\r
-\r
+}
\ No newline at end of file