aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLarry Sachs <larry.j.sachs@intel.com>2018-01-11 12:22:08 -0800
committerLarry Sachs <larry.j.sachs@intel.com>2018-01-11 12:22:08 -0800
commit479f987ca8ffc5b6d7834d8bcd319e5a80b2b198 (patch)
tree676d5490d0aba5eb6cdd4d9ea2b071250c2bfb2c
parent2d6570a4a5a8baf58f335245469f0101e53c9be3 (diff)
[IOT-582] Updates for Universal Android apk1.3-rel
Change-Id: Ied90cfc0dffb7712f778a9353a7d7eb0fc623ce5 Signed-off-by: Larry Sachs <larry.j.sachs@intel.com>
-rw-r--r--android/examples/upnpavclient/build.gradle22
-rw-r--r--android/examples/upnpclient/build.gradle22
2 files changed, 42 insertions, 2 deletions
diff --git a/android/examples/upnpavclient/build.gradle b/android/examples/upnpavclient/build.gradle
index 37b2500..204788e 100644
--- a/android/examples/upnpavclient/build.gradle
+++ b/android/examples/upnpavclient/build.gradle
@@ -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}"
diff --git a/android/examples/upnpclient/build.gradle b/android/examples/upnpclient/build.gradle
index 5af8526..1ee9e13 100644
--- a/android/examples/upnpclient/build.gradle
+++ b/android/examples/upnpclient/build.gradle
@@ -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}"