Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: disable x86 support [WPB-11427] 🍒 #3671

Merged
merged 2 commits into from
Nov 27, 2024
Merged

feat: disable x86 support [WPB-11427] 🍒 #3671

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
85163ab
feat: disable x86 support [WPB-11427] (#3600)
MohamadJaara Nov 27, 2024
ca69ba1
Merge branch 'develop' into feat/disable-x86-support-cherry-pick
yamilmedina Nov 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .github/workflows/gradle-run-ui-tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ jobs:
with:
api-level: ${{ matrix.api-level }}
target: google_apis
arch: x86_64
script: ./gradlew runAcceptanceTests
env:
GITHUB_USER: ${{ github.actor }}
Expand Down
8 changes: 8 additions & 0 deletions app/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,14 @@ private fun getFlavorsSettings(): NormalizedFlavorSettings =

android {
defaultConfig {
ndk {
abiFilters.apply {
add("armeabi-v7a")
add("arm64-v8a")
add("x86_64")
}
}

val datadogApiKeyKey = "DATADOG_CLIENT_TOKEN"
val datadogApiKey: String? = System.getenv(datadogApiKeyKey) ?: project.getLocalProperty(datadogApiKeyKey, null)
buildConfigField("String", datadogApiKeyKey, datadogApiKey?.let { "\"$it\"" } ?: "null")
Expand Down
1 change: 1 addition & 0 deletions buildSrc/src/main/kotlin/scripts/variants.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,7 @@ android {
}

buildTypes {

getByName(BuildTypes.DEBUG) {
isMinifyEnabled = false
applicationIdSuffix = ".${BuildTypes.DEBUG}"
Expand Down
Loading