mirror of
https://github.com/opencv/opencv.git
synced 2025-06-07 17:44:04 +08:00
Merge pull request #24788 from asmorkalov:as/android_samples_repo_typo
Fixed typo in Android build scripts.
This commit is contained in:
commit
75dc334d39
@ -31,7 +31,7 @@ dependencies {
|
|||||||
if (gradle.opencv_source == 'sdk_path') {
|
if (gradle.opencv_source == 'sdk_path') {
|
||||||
println 'Using OpenCV from SDK'
|
println 'Using OpenCV from SDK'
|
||||||
implementation project(':opencv')
|
implementation project(':opencv')
|
||||||
} else if (gradle.opencv_source == 'maven_local' || gradle.opencv_source == 'maven_cenral') {
|
} else if (gradle.opencv_source == 'maven_local' || gradle.opencv_source == 'maven_central') {
|
||||||
println 'Using OpenCV from Maven repo'
|
println 'Using OpenCV from Maven repo'
|
||||||
implementation 'org.opencv:opencv:@OPENCV_VERSION_PLAIN@'
|
implementation 'org.opencv:opencv:@OPENCV_VERSION_PLAIN@'
|
||||||
}
|
}
|
||||||
|
@ -31,7 +31,7 @@ dependencies {
|
|||||||
if (gradle.opencv_source == "sdk_path") {
|
if (gradle.opencv_source == "sdk_path") {
|
||||||
println 'Using OpenCV from SDK'
|
println 'Using OpenCV from SDK'
|
||||||
implementation project(':opencv')
|
implementation project(':opencv')
|
||||||
} else if (gradle.opencv_source == "maven_local" || gradle.opencv_source == "maven_cenral") {
|
} else if (gradle.opencv_source == "maven_local" || gradle.opencv_source == "maven_central") {
|
||||||
println 'Using OpenCV from Maven repo'
|
println 'Using OpenCV from Maven repo'
|
||||||
implementation 'org.opencv:opencv:@OPENCV_VERSION_PLAIN@'
|
implementation 'org.opencv:opencv:@OPENCV_VERSION_PLAIN@'
|
||||||
}
|
}
|
||||||
|
@ -31,7 +31,7 @@ dependencies {
|
|||||||
if (gradle.opencv_source == "sdk_path") {
|
if (gradle.opencv_source == "sdk_path") {
|
||||||
println 'Using OpenCV from from SDK'
|
println 'Using OpenCV from from SDK'
|
||||||
implementation project(':opencv')
|
implementation project(':opencv')
|
||||||
} else if (gradle.opencv_source == "maven_local" || gradle.opencv_source == "maven_cenral") {
|
} else if (gradle.opencv_source == "maven_local" || gradle.opencv_source == "maven_central") {
|
||||||
println 'Using OpenCV from Maven repo'
|
println 'Using OpenCV from Maven repo'
|
||||||
implementation 'org.opencv:opencv:@OPENCV_VERSION_PLAIN@'
|
implementation 'org.opencv:opencv:@OPENCV_VERSION_PLAIN@'
|
||||||
}
|
}
|
||||||
|
@ -31,7 +31,7 @@ dependencies {
|
|||||||
if (gradle.opencv_source == "sdk_path") {
|
if (gradle.opencv_source == "sdk_path") {
|
||||||
println 'Using OpenCV from from SDK'
|
println 'Using OpenCV from from SDK'
|
||||||
implementation project(':opencv')
|
implementation project(':opencv')
|
||||||
} else if (gradle.opencv_source == "maven_local" || gradle.opencv_source == "maven_cenral") {
|
} else if (gradle.opencv_source == "maven_local" || gradle.opencv_source == "maven_central") {
|
||||||
println 'Using OpenCV from Maven repo'
|
println 'Using OpenCV from Maven repo'
|
||||||
implementation 'org.opencv:opencv:@OPENCV_VERSION_PLAIN@'
|
implementation 'org.opencv:opencv:@OPENCV_VERSION_PLAIN@'
|
||||||
}
|
}
|
||||||
|
@ -31,7 +31,7 @@ dependencies {
|
|||||||
if (gradle.opencv_source == "sdk_path") {
|
if (gradle.opencv_source == "sdk_path") {
|
||||||
println 'Using OpenCV from from SDK'
|
println 'Using OpenCV from from SDK'
|
||||||
implementation project(':opencv')
|
implementation project(':opencv')
|
||||||
} else if (gradle.opencv_source == "maven_local" || gradle.opencv_source == "maven_cenral") {
|
} else if (gradle.opencv_source == "maven_local" || gradle.opencv_source == "maven_central") {
|
||||||
println 'Using OpenCV from Maven repo'
|
println 'Using OpenCV from Maven repo'
|
||||||
implementation 'org.opencv:opencv:@OPENCV_VERSION_PLAIN@'
|
implementation 'org.opencv:opencv:@OPENCV_VERSION_PLAIN@'
|
||||||
}
|
}
|
||||||
|
@ -31,7 +31,7 @@ dependencies {
|
|||||||
if (gradle.opencv_source == "sdk_path") {
|
if (gradle.opencv_source == "sdk_path") {
|
||||||
println 'Using OpenCV from SDK'
|
println 'Using OpenCV from SDK'
|
||||||
implementation project(':opencv')
|
implementation project(':opencv')
|
||||||
} else if (gradle.opencv_source == "maven_local" || gradle.opencv_source == "maven_cenral") {
|
} else if (gradle.opencv_source == "maven_local" || gradle.opencv_source == "maven_central") {
|
||||||
println 'Using OpenCV from Maven repo'
|
println 'Using OpenCV from Maven repo'
|
||||||
implementation 'org.opencv:opencv:@OPENCV_VERSION_PLAIN@'
|
implementation 'org.opencv:opencv:@OPENCV_VERSION_PLAIN@'
|
||||||
}
|
}
|
||||||
|
@ -30,7 +30,7 @@ dependencies {
|
|||||||
//implementation fileTree(dir: 'libs', include: ['*.jar'])
|
//implementation fileTree(dir: 'libs', include: ['*.jar'])
|
||||||
if (gradle.opencv_source == "sdk_path") {
|
if (gradle.opencv_source == "sdk_path") {
|
||||||
implementation project(':opencv')
|
implementation project(':opencv')
|
||||||
} else if (gradle.opencv_source == "maven_local" || gradle.opencv_source == "maven_cenral") {
|
} else if (gradle.opencv_source == "maven_local" || gradle.opencv_source == "maven_central") {
|
||||||
implementation 'org.opencv:opencv:@OPENCV_VERSION_PLAIN@'
|
implementation 'org.opencv:opencv:@OPENCV_VERSION_PLAIN@'
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -31,7 +31,7 @@ dependencies {
|
|||||||
if (gradle.opencv_source == "sdk_path") {
|
if (gradle.opencv_source == "sdk_path") {
|
||||||
println 'Using OpenCV from SDK'
|
println 'Using OpenCV from SDK'
|
||||||
implementation project(':opencv')
|
implementation project(':opencv')
|
||||||
} else if (gradle.opencv_source == "maven_local" || gradle.opencv_source == "maven_cenral") {
|
} else if (gradle.opencv_source == "maven_local" || gradle.opencv_source == "maven_central") {
|
||||||
println 'Using OpenCV from Maven repo'
|
println 'Using OpenCV from Maven repo'
|
||||||
implementation 'org.opencv:opencv:@OPENCV_VERSION_PLAIN@'
|
implementation 'org.opencv:opencv:@OPENCV_VERSION_PLAIN@'
|
||||||
}
|
}
|
||||||
|
@ -44,7 +44,7 @@ android {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
buildFeatures {
|
buildFeatures {
|
||||||
if (gradle.opencv_source == "maven_local" || gradle.opencv_source == "maven_cenral") {
|
if (gradle.opencv_source == "maven_local" || gradle.opencv_source == "maven_central") {
|
||||||
prefab true
|
prefab true
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -55,7 +55,7 @@ dependencies {
|
|||||||
if (gradle.opencv_source == "sdk_path") {
|
if (gradle.opencv_source == "sdk_path") {
|
||||||
println 'Using OpenCV from SDK'
|
println 'Using OpenCV from SDK'
|
||||||
implementation project(':opencv')
|
implementation project(':opencv')
|
||||||
} else if (gradle.opencv_source == "maven_local" || gradle.opencv_source == "maven_cenral") {
|
} else if (gradle.opencv_source == "maven_local" || gradle.opencv_source == "maven_central") {
|
||||||
println 'Using OpenCV from Maven repo'
|
println 'Using OpenCV from Maven repo'
|
||||||
implementation 'org.opencv:opencv:@OPENCV_VERSION_PLAIN@'
|
implementation 'org.opencv:opencv:@OPENCV_VERSION_PLAIN@'
|
||||||
}
|
}
|
||||||
|
@ -31,7 +31,7 @@ dependencies {
|
|||||||
if (gradle.opencv_source == "sdk_path") {
|
if (gradle.opencv_source == "sdk_path") {
|
||||||
println 'Using OpenCV from SDK'
|
println 'Using OpenCV from SDK'
|
||||||
implementation project(':opencv')
|
implementation project(':opencv')
|
||||||
} else if (gradle.opencv_source == "maven_local" || gradle.opencv_source == "maven_cenral") {
|
} else if (gradle.opencv_source == "maven_local" || gradle.opencv_source == "maven_central") {
|
||||||
println 'Using OpenCV from Maven repo'
|
println 'Using OpenCV from Maven repo'
|
||||||
implementation 'org.opencv:opencv:@OPENCV_VERSION_PLAIN@'
|
implementation 'org.opencv:opencv:@OPENCV_VERSION_PLAIN@'
|
||||||
}
|
}
|
||||||
|
@ -46,7 +46,7 @@ android {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
buildFeatures {
|
buildFeatures {
|
||||||
if (gradle.opencv_source == "maven_local" || gradle.opencv_source == "maven_cenral") {
|
if (gradle.opencv_source == "maven_local" || gradle.opencv_source == "maven_central") {
|
||||||
prefab true
|
prefab true
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -57,7 +57,7 @@ dependencies {
|
|||||||
if (gradle.opencv_source == "sdk_path") {
|
if (gradle.opencv_source == "sdk_path") {
|
||||||
println 'Using OpenCV from SDK'
|
println 'Using OpenCV from SDK'
|
||||||
implementation project(':opencv')
|
implementation project(':opencv')
|
||||||
} else if (gradle.opencv_source == "maven_local" || gradle.opencv_source == "maven_cenral") {
|
} else if (gradle.opencv_source == "maven_local" || gradle.opencv_source == "maven_central") {
|
||||||
println 'Using OpenCV from Maven repo'
|
println 'Using OpenCV from Maven repo'
|
||||||
implementation 'org.opencv:opencv:@OPENCV_VERSION_PLAIN@'
|
implementation 'org.opencv:opencv:@OPENCV_VERSION_PLAIN@'
|
||||||
}
|
}
|
||||||
|
@ -30,7 +30,7 @@ dependencies {
|
|||||||
//implementation fileTree(dir: 'libs', include: ['*.jar'])
|
//implementation fileTree(dir: 'libs', include: ['*.jar'])
|
||||||
if (gradle.opencv_source == "sdk_path") {
|
if (gradle.opencv_source == "sdk_path") {
|
||||||
implementation project(':opencv')
|
implementation project(':opencv')
|
||||||
} else if (gradle.opencv_source == "maven_local" || gradle.opencv_source == "maven_cenral") {
|
} else if (gradle.opencv_source == "maven_local" || gradle.opencv_source == "maven_central") {
|
||||||
implementation 'org.opencv:opencv:@OPENCV_VERSION_PLAIN@'
|
implementation 'org.opencv:opencv:@OPENCV_VERSION_PLAIN@'
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user