Skip to content

Commit f01a812

Browse files
persidskiygithub-actions[bot]
authored andcommitted
Optimize android smoke
GitOrigin-RevId: c1e8f9571e1b0211ba5fa76ba3f2c623d4bd932f
1 parent b41b443 commit f01a812

File tree

3 files changed

+19
-21
lines changed

3 files changed

+19
-21
lines changed

app/build.gradle.kts

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,13 @@ android {
4040
multiDexEnabled = true
4141
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
4242
testInstrumentationRunnerArguments += mapOf("clearPackageData" to "true")
43+
ndk {
44+
val abi: String =
45+
if (System.getenv("ANDROID_ABI") != null) System.getenv("ANDROID_ABI") else ""
46+
if (abi.isNotBlank() && !project.hasProperty("android.injected.invoked.from.ide")) {
47+
abiFilters.add(abi)
48+
}
49+
}
4350
}
4451
buildTypes {
4552
getByName("release") {

maps-sdk/build.gradle.kts

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,13 @@ android {
4848
} else {
4949
buildConfigField("boolean", "RUN_FROM_IDE", "false")
5050
}
51+
ndk {
52+
val abi: String =
53+
if (System.getenv("ANDROID_ABI") != null) System.getenv("ANDROID_ABI") else ""
54+
if (abi.isNotBlank() && !project.hasProperty("android.injected.invoked.from.ide")) {
55+
abiFilters.add(abi)
56+
}
57+
}
5158
}
5259

5360
testOptions {
@@ -63,18 +70,6 @@ android {
6370
targetCompatibility = JavaVersion.VERSION_1_8
6471
}
6572
}
66-
67-
buildTypes {
68-
debug {
69-
ndk {
70-
var abi: String =
71-
if (System.getenv("ANDROID_ABI") != null) System.getenv("ANDROID_ABI") else ""
72-
if (abi.isNotBlank()) {
73-
abiFilters.add(abi)
74-
}
75-
}
76-
}
77-
}
7873
}
7974

8075
dependencies {

module-telemetry/build.gradle.kts

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,11 @@ android {
1010
minSdk = libs.versions.androidMinSdkVersion.get().toInt()
1111
targetSdk = libs.versions.androidTargetSdkVersion.get().toInt()
1212
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
13-
}
14-
buildTypes {
15-
debug {
16-
ndk {
17-
var abi: String =
18-
if (System.getenv("ANDROID_ABI") != null) System.getenv("ANDROID_ABI") else ""
19-
if (abi.isNotBlank()) {
20-
abiFilters.add(abi)
21-
}
13+
ndk {
14+
val abi: String =
15+
if (System.getenv("ANDROID_ABI") != null) System.getenv("ANDROID_ABI") else ""
16+
if (abi.isNotBlank() && !project.hasProperty("android.injected.invoked.from.ide")) {
17+
abiFilters.add(abi)
2218
}
2319
}
2420
}

0 commit comments

Comments
 (0)