Skip to content
Merged
Changes from all commits
Commits
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
21 changes: 20 additions & 1 deletion play-services-core/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,26 @@ android {

ndk {
def requestedAbi = project.findProperty("abi")
abiFilters requestedAbi ? requestedAbi : "armeabi-v7a", "arm64-v8a", "x86", "x86_64"
// With -Pabi set, ABI splits below handle filtering; an ndk abiFilters
// would conflict with the split filters.
if (!requestedAbi) {
abiFilters "armeabi-v7a", "arm64-v8a", "x86", "x86_64"
}
}
}

// ABI splits: when -Pabi=<abi> is set, package ONLY that ABI's native libs
// (ndk.abiFilters above does not strip jniLibs shipped inside AAR dependencies).
splits {
abi {
if (project.hasProperty("abi")) {
enable true
reset()
include project.property("abi")
universalApk false
} else {
enable false
}
}
}

Expand Down