X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=android%2Fandroid_api%2Fbase%2Fbuild.gradle;h=82fb651b2f885dec5a91ea822b7eacd919dca945;hb=17c68b2fd1e74586f85e552eeab4e32dc121f8a0;hp=9cbdaf8d08942d6c3c183ca4426f3e133e847b32;hpb=8c01dff2c5bc5496f7dc1632c498943ec6ecb015;p=platform%2Fupstream%2Fiotivity.git diff --git a/android/android_api/base/build.gradle b/android/android_api/base/build.gradle index 9cbdaf8..82fb651 100755 --- a/android/android_api/base/build.gradle +++ b/android/android_api/base/build.gradle @@ -25,13 +25,13 @@ apply plugin: 'com.android.library' android { compileSdkVersion 21 buildToolsVersion "20.0.0" - archivesBaseName = "iotivity" + archivesBaseName = "iotivity-base" libraryVariants.all { variant -> variant.outputs.each { output -> def outputFile = output.outputFile if (outputFile != null && outputFile.name.endsWith('.aar')) { - def fileName = "${archivesBaseName}-${TARGET_ARCH}-${outputFile.name}" + def fileName = "${archivesBaseName}-${TARGET_ARCH}-${RELEASE}.aar" output.outputFile = new File(outputFile.parent, fileName) } } @@ -41,7 +41,7 @@ android { minSdkVersion 21 targetSdkVersion 21 versionCode 1 - versionName "0.9" + versionName "1.0" } buildTypes { release { @@ -50,7 +50,7 @@ android { } lintOptions { - abortOnError false + abortOnError false } sourceSets { @@ -94,22 +94,11 @@ task buildNative(type: Exec) { //for windows use 'ndk-build.cmd' //def ndkBuild = new File(System.env.ANDROID_NDK_HOME, 'ndk-build.cmd') def ndkBuild = new File(System.env.ANDROID_NDK_HOME, 'ndk-build') - commandLine ndkBuild, "APP_ABI=$TARGET_ARCH", "APP_OPTIM=$RELEASE" + commandLine ndkBuild, "APP_ABI=$TARGET_ARCH", "APP_OPTIM=$RELEASE", "SECURE=$SECURED" } else { println '##################' println 'Skipping NDK build' println 'Reason: ANDROID_NDK_HOME not set.' println '##################' } -} -// -//task (copyARR, type: Copy) { -// copy { -// from 'build/outputs/aar/' -// into '../../../out/android/' -// include '**/*.aar' -// } -//} -//build.finalizedBy(copyARR) - - +} \ No newline at end of file