Skip to content

Commit 9510648

Browse files
Centralize minSdkVersion in Version Catalog across modules
Removed module-specific minSdk overrides to rely on the centralized value defined in the Version Catalog and applied via convention plugins.
1 parent bd378f0 commit 9510648

9 files changed

Lines changed: 7 additions & 21 deletions

File tree

camera/basic/build.gradle.kts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ android {
66
namespace = "com.sample.camera.basic"
77
defaultConfig {
88
applicationId = "com.sample.camera.basic"
9-
minSdk = 24
109
externalNativeBuild {
1110
cmake {
1211
arguments.add("-DANDROID_STL=c++_static")

camera/camera-utils/build.gradle.kts

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,6 @@ plugins {
55
android {
66
namespace = "com.android.ndk.samples.camera.utils"
77

8-
defaultConfig {
9-
minSdk = 24
10-
}
11-
128
externalNativeBuild {
139
cmake {
1410
path = file("src/main/cpp/CMakeLists.txt")

camera/texture-view/build.gradle.kts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ android {
66
namespace = "com.sample.textureview"
77
defaultConfig {
88
applicationId = "com.sample.camera.textureview"
9-
minSdk = 24
109
externalNativeBuild {
1110
cmake {
1211
arguments.add("-DANDROID_STL=c++_static")

hello-vulkan/app/build.gradle.kts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,6 @@ android {
2424

2525
defaultConfig {
2626
applicationId = "com.android.hellovk"
27-
// TODO: Figure out why this isn't 24.
28-
minSdk = 30
2927
externalNativeBuild {
3028
cmake {
3129
// Available arguments are inside ${SDK}/cmake/.../android.toolchain.cmake file

native-activity/app/build.gradle.kts

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,6 @@ android {
1111

1212
defaultConfig {
1313
applicationId = "com.example.native_activity"
14-
// This is the minimum required for using Choreographer directly from the NDK. If you need
15-
// to use a lower minSdkVersion, you must use the Java Choreographer API via JNI.
16-
minSdk = 24
1714
externalNativeBuild {
1815
cmake {
1916
arguments.add("-DANDROID_STL=c++_static")

native-audio/app/build.gradle.kts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ android {
77

88
defaultConfig {
99
applicationId = "com.example.nativeaudio"
10-
minSdk = 24
1110
}
1211

1312
externalNativeBuild {

native-midi/app/build.gradle.kts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ android {
77

88
defaultConfig {
99
applicationId = "com.example.nativemidi"
10-
minSdk = 29
1110
versionCode = 1
1211
versionName = "1.0"
1312
externalNativeBuild {

sanitizers/app/build.gradle.kts

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,11 @@ android {
88

99
defaultConfig {
1010
applicationId = "com.example.sanitizers"
11-
// If you raise minSdk to 23 or higher, make sure you've read the note
12-
// below about useLegacyPackaging.
11+
// Since the project's minSdk is 24, we need to use legacy packaging
12+
// for ASan and HWASan to work. See the notes in the buildTypes block
13+
// below.
1314
//
14-
// Note that the hwasan build type will override this. See the
15+
// Note that the hwasan build type will override this. See the
1516
// androidComponents stanza below.
1617
versionCode = 1
1718
versionName = "1.0"
@@ -109,10 +110,9 @@ android {
109110
// doesn't work in that configuration, so we need to
110111
// opt-out of the new behavior.
111112
//
112-
// Note that this won't actually do anything to the sample
113-
// in its default configuration. The sample uses minSdk 23,
114-
// and legacy packaging is the default for all builds below
115-
// minSdk 23.
113+
// Note that since the project is at minSdk 24, legacy
114+
// packaging is now required here as the default for
115+
// minSdk 23 and above is to load from the APK.
116116
useLegacyPackaging = true
117117
}
118118
}

teapots/image-decoder/build.gradle.kts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ android {
77

88
defaultConfig {
99
applicationId = "com.sample.imagedecoder"
10-
minSdk = 30
1110
externalNativeBuild {
1211
cmake {
1312
arguments.add("-DANDROID_STL=c++_static")

0 commit comments

Comments
 (0)