projects
/
platform
/
upstream
/
iotivity.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Imported Upstream version 1.1.1
[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
..
a0b52ae
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
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
\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
output.outputFile = new File(outputFile.parent, fileName)
\r
}
\r
}
\r
@@
-41,7
+41,8
@@
android {
minSdkVersion 21
\r
targetSdkVersion 21
\r
versionCode 1
\r
minSdkVersion 21
\r
targetSdkVersion 21
\r
versionCode 1
\r
- versionName "0.9"
\r
+ versionName "1.1.1"
\r
+ buildConfigField 'int', 'SECURED', SECURED
\r
}
\r
buildTypes {
\r
release {
\r
}
\r
buildTypes {
\r
release {
\r
@@
-50,7
+51,7
@@
android {
}
\r
\r
lintOptions {
\r
}
\r
\r
lintOptions {
\r
- abortOnError false
\r
+
abortOnError false
\r
}
\r
\r
sourceSets {
\r
}
\r
\r
sourceSets {
\r
@@
-94,7
+95,7
@@
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
//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
} else {
\r
println '##################'
\r
println 'Skipping NDK build'
\r
@@
-102,14
+103,3
@@
task buildNative(type: Exec) {
println '##################'
\r
}
\r
}
\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