Commit 479f987c authored by Larry Sachs's avatar Larry Sachs

[IOT-582] Updates for Universal Android apk

Change-Id: Ied90cfc0dffb7712f778a9353a7d7eb0fc623ce5
Signed-off-by: Larry Sachs's avatarLarry Sachs <larry.j.sachs@intel.com>
parent 2d6570a4
Pipeline #36 failed with stages
in 14 seconds
......@@ -40,6 +40,26 @@ android {
lintOptions {
abortOnError false
}
project.ext.versionCodes = ['armeabi':1, 'armeabi-v7a':2, 'arm64-v8a':3, 'x86':4, 'x86_64':5]
applicationVariants.all { variant ->
// assign different version code for each output
variant.outputs.each { output ->
output.versionCodeOverride =
project.ext.versionCodes.get(output.getFilter(com.android.build.OutputFile.ABI),
0) * 1000000 + defaultConfig.versionCode
}
}
splits {
abi {
enable true
reset()
include 'armeabi', 'x86', 'armeabi-v7a', 'x86_64', 'arm64-v8a'
universalApk true
}
}
}
repositories {
flatDir {
......@@ -49,7 +69,7 @@ repositories {
try {
dependencies {
compile ":iotivity-base-${TARGET_ARCH}-${RELEASE}@aar"
compile ":iotivity-base-${RELEASE}@aar"
}
} catch (all) {
print "${ERROR_MSG}"
......
......@@ -40,6 +40,26 @@ android {
lintOptions {
abortOnError false
}
project.ext.versionCodes = ['armeabi':1, 'armeabi-v7a':2, 'arm64-v8a':3, 'x86':4, 'x86_64':5]
applicationVariants.all { variant ->
// assign different version code for each output
variant.outputs.each { output ->
output.versionCodeOverride =
project.ext.versionCodes.get(output.getFilter(com.android.build.OutputFile.ABI),
0) * 1000000 + defaultConfig.versionCode
}
}
splits {
abi {
enable true
reset()
include 'armeabi', 'x86', 'armeabi-v7a', 'x86_64', 'arm64-v8a'
universalApk true
}
}
}
repositories {
flatDir {
......@@ -49,7 +69,7 @@ repositories {
try {
dependencies {
compile ":iotivity-base-${TARGET_ARCH}-${RELEASE}@aar"
compile ":iotivity-base-${RELEASE}@aar"
}
} catch (all) {
print "${ERROR_MSG}"
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment