mirror of
https://github.com/opencv/opencv.git
synced 2026-07-30 07:43:03 +04:00
Merge pull request #16222 from hannesa2:AndroidMoveVersionInfo
Android move version info to Gradle style * move version info to Gradle style * Use VERSION_NAME in loader * apply review suggestion
This commit is contained in:
committed by
Alexander Alekhin
parent
ccfca869e5
commit
43a91f82fe
@@ -90,16 +90,21 @@
|
||||
|
||||
apply plugin: 'com.android.library'
|
||||
|
||||
println "OpenCV: " + project.buildscript.sourceFile
|
||||
def openCVersionName = "@OPENCV_VERSION@"
|
||||
def openCVersionCode = @OPENCV_VERSION_MAJOR@@OPENCV_VERSION_MINOR@@OPENCV_VERSION_PATCH@0
|
||||
|
||||
println "OpenCV: " +openCVersionName + " " + project.buildscript.sourceFile
|
||||
|
||||
android {
|
||||
compileSdkVersion @ANDROID_COMPILE_SDK_VERSION@
|
||||
//buildToolsVersion "x.y.z" // not needed since com.android.tools.build:gradle:3.0.0
|
||||
|
||||
defaultConfig {
|
||||
minSdkVersion @ANDROID_MIN_SDK_VERSION@
|
||||
targetSdkVersion @ANDROID_TARGET_SDK_VERSION@
|
||||
|
||||
versionCode openCVersionCode
|
||||
versionName openCVersionName
|
||||
|
||||
externalNativeBuild {
|
||||
cmake {
|
||||
arguments "-DANDROID_STL=@ANDROID_STL@"
|
||||
|
||||
Reference in New Issue
Block a user