Skip to content

Build all Android ABIs available in NDK r16b. #173

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

Merged
merged 8 commits into from
Oct 27, 2020
Merged

Build all Android ABIs available in NDK r16b. #173

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
999ada6
Add custom ABI list when building against NDK r16b.
jonsimantov Oct 27, 2020
43c7612
Fix getenv call.
jonsimantov Oct 27, 2020
c120fe8
Fix gradle error.
jonsimantov Oct 27, 2020
0bae40d
Remove armeabi-v7a-hard, which is no longer supported.
jonsimantov Oct 27, 2020
30ed25f
Better way to check ndk version.
jonsimantov Oct 27, 2020
199f6bd
Revert "Better way to check ndk version."
jonsimantov Oct 27, 2020
91e1c2c
Add armeabi-v7a-hard when using NDK r11c.
jonsimantov Oct 27, 2020
d54b619
Simplify Gradle code for ABI filtering.
jonsimantov Oct 27, 2020
File filter

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 admob/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,7 @@ android {
dependencies {
implementation project(':app')
}
apply from: "$rootDir/android_build_files/android_abis.gradle"
apply from: "$rootDir/android_build_files/extract_and_dex.gradle"
apply from: "$rootDir/android_build_files/generate_proguard.gradle"
project.afterEvaluate {
Expand Down
1 change: 1 addition & 0 deletions analytics/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,7 @@ android {
dependencies {
implementation project(':app')
}
apply from: "$rootDir/android_build_files/android_abis.gradle"
apply from: "$rootDir/android_build_files/extract_and_dex.gradle"
apply from: "$rootDir/android_build_files/generate_proguard.gradle"
project.afterEvaluate {
Expand Down
41 changes: 41 additions & 0 deletions android_build_files/android_abis.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
// Copyright 2018 Google LLC
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

// Set the list of Android ABIs depending on whether we the NDK_ROOT environment
// variable contains the text 'r16b' in it. This will generally only occur
// during C++ packaging, which uses /tmp/android-ndk-r16b as the NDK directory.
// When using this NDK version, add a few additional ABIs that are only
// supported in r16b and earlier.

android {
defaultConfig {
ndk {
// Default list of ABIs available in up-to-date NDK.
abiFilters "x86", "armeabi-v7a", "arm64-v8a", "x86_64"

if (System.getenv('NDK_ROOT').contains('r16b') ||
System.getenv('NDK_ROOT').contains('r11c')) {
// Deprecated ABIs are added to the list when building using older NDKs only.
// Rather than an exhaustive list, we only support r11c and r16b.
abiFilters.add("armeabi")
abiFilters.add("mips")
abiFilters.add("mips64")
if (System.getenv('NDK_ROOT').contains('r11c')) {
abiFilters.add("armeabi-v7a-hard") // Removed after r11c.
}
}
}
}
}

1 change: 1 addition & 0 deletions app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@ android {
}
}

apply from: "$rootDir/android_build_files/android_abis.gradle"
apply from: "$rootDir/android_build_files/extract_and_dex.gradle"
apply from: "$rootDir/android_build_files/generate_proguard.gradle"
project.afterEvaluate {
Expand Down
1 change: 1 addition & 0 deletions auth/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,7 @@ android {
dependencies {
implementation project(':app')
}
apply from: "$rootDir/android_build_files/android_abis.gradle"
apply from: "$rootDir/android_build_files/extract_and_dex.gradle"
apply from: "$rootDir/android_build_files/generate_proguard.gradle"
project.afterEvaluate {
Expand Down
1 change: 1 addition & 0 deletions database/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,7 @@ android {
dependencies {
implementation project(':app')
}
apply from: "$rootDir/android_build_files/android_abis.gradle"
apply from: "$rootDir/android_build_files/extract_and_dex.gradle"
apply from: "$rootDir/android_build_files/generate_proguard.gradle"
project.afterEvaluate {
Expand Down
1 change: 1 addition & 0 deletions dynamic_links/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,7 @@ android {
dependencies {
implementation project(':app')
}
apply from: "$rootDir/android_build_files/android_abis.gradle"
apply from: "$rootDir/android_build_files/generate_proguard.gradle"
project.afterEvaluate {
generateProguardFile('dynamic_links')
Expand Down
1 change: 1 addition & 0 deletions firestore/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,7 @@ android {
dependencies {
implementation project(':app')
}
apply from: "$rootDir/android_build_files/android_abis.gradle"
apply from: "$rootDir/android_build_files/extract_and_dex.gradle"
apply from: "$rootDir/android_build_files/generate_proguard.gradle"
project.afterEvaluate {
Expand Down
1 change: 1 addition & 0 deletions functions/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,7 @@ android {
dependencies {
implementation project(':app')
}
apply from: "$rootDir/android_build_files/android_abis.gradle"
apply from: "$rootDir/android_build_files/generate_proguard.gradle"
project.afterEvaluate {
generateProguardFile('functions')
Expand Down
1 change: 1 addition & 0 deletions instance_id/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,7 @@ android {
dependencies {
implementation project(':app')
}
apply from: "$rootDir/android_build_files/android_abis.gradle"
apply from: "$rootDir/android_build_files/generate_proguard.gradle"
project.afterEvaluate {
generateProguardFile('instance_id')
Expand Down
1 change: 1 addition & 0 deletions messaging/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,7 @@ dependencies {
implementation project(':app')
implementation project(':messaging:messaging_java')
}
apply from: "$rootDir/android_build_files/android_abis.gradle"
apply from: "$rootDir/android_build_files/extract_and_dex.gradle"
apply from: "$rootDir/android_build_files/generate_proguard.gradle"
project.afterEvaluate {
Expand Down
1 change: 1 addition & 0 deletions remote_config/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,7 @@ android {
dependencies {
implementation project(':app')
}
apply from: "$rootDir/android_build_files/android_abis.gradle"
apply from: "$rootDir/android_build_files/extract_and_dex.gradle"
apply from: "$rootDir/android_build_files/generate_proguard.gradle"
project.afterEvaluate {
Expand Down
1 change: 1 addition & 0 deletions storage/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,7 @@ android {
dependencies {
implementation project(':app')
}
apply from: "$rootDir/android_build_files/android_abis.gradle"
apply from: "$rootDir/android_build_files/extract_and_dex.gradle"
apply from: "$rootDir/android_build_files/generate_proguard.gradle"
project.afterEvaluate {
Expand Down