diff options
-rw-r--r-- | ccnxandroidmetis/MetisControl/build.gradle | 8 | ||||
-rw-r--r-- | config/config.mk | 2 | ||||
-rw-r--r-- | iget_android/app/build.gradle | 12 |
3 files changed, 20 insertions, 2 deletions
diff --git a/ccnxandroidmetis/MetisControl/build.gradle b/ccnxandroidmetis/MetisControl/build.gradle index a1e8ed15..99dca119 100644 --- a/ccnxandroidmetis/MetisControl/build.gradle +++ b/ccnxandroidmetis/MetisControl/build.gradle @@ -16,6 +16,14 @@ android { release { minifyEnabled false proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' + applicationVariants.all { variant -> + variant.outputs.each { output -> + project.ext { appName = 'metis' } + def newName = output.outputFile.name + newName = newName.replace("MetisControl", "$project.ext.appName-$System.env.ABI") + output.outputFile = new File(output.outputFile.parent, newName) + } + } } } diff --git a/config/config.mk b/config/config.mk index d06f58dd..a1e38dab 100644 --- a/config/config.mk +++ b/config/config.mk @@ -101,5 +101,5 @@ export ARCH=$(shell uname -m) CCNX_COMPILE_ENVIRONMENT=-DCMAKE_TOOLCHAIN_FILE=${DISTILLERY_ROOT_DIR}/config/config.android OPEN_SSL_DIR=-DOPENSSL_ROOT_DIR=${DISTILLERY_INSTALL_DIR} LIBEVENT_ROOT=${DISTILLERY_INSTALL_DIR} -ABI=armeabi-v7a +export ABI=armeabi-v7a diff --git a/iget_android/app/build.gradle b/iget_android/app/build.gradle index 43638e0a..13321fc0 100644 --- a/iget_android/app/build.gradle +++ b/iget_android/app/build.gradle @@ -30,7 +30,15 @@ android { release { minifyEnabled false proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' - signingConfig signingConfigs.release + applicationVariants.all { variant -> + variant.outputs.each { output -> + project.ext { appName = 'iget' } + def newName = output.outputFile.name + newName = newName.replace("app", "$project.ext.appName-$System.env.ABI") + output.outputFile = new File(output.outputFile.parent, newName) + } + } + signingConfig signingConfigs.release } debug { debuggable true @@ -56,6 +64,8 @@ android { abi { enable true // enable ABI split feature to create one APK per ABI universalApk false // don't generate an additional APK that targets all the ABIs + reset() + include 'armeabi-v7a' } } |