Skip to content

fix(android): respect reactNativeArchitectures to skip unnecessary ABI builds #1970

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

Open
SscSPs wants to merge 1 commit into
base: master
Choose a base branch
from
+17 −0
Open

fix(android): respect reactNativeArchitectures to skip unnecessary ABI builds #1970

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
17 changes: 17 additions & 0 deletions native/android-jsi/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,20 @@ def DEFAULT_MIN_SDK_VERSION = 16
def DEFAULT_TARGET_SDK_VERSION = 28
def DEFAULT_NDK_VERSION = "20.1.5948944"

// Respect reactNativeArchitectures from the parent project to avoid
// building native libraries for unnecessary ABIs (e.g. x86, x86_64).
// Supports both the short 'reactNativeArchitectures' and scoped
// 'react.nativeArchitectures' property names used by React Native.
def reactNativeArchitectures = []
if (rootProject.hasProperty('reactNativeArchitectures')) {
reactNativeArchitectures = rootProject.property('reactNativeArchitectures').split(',')
}
if (rootProject.hasProperty('react.nativeArchitectures')) {
reactNativeArchitectures = rootProject.property('react.nativeArchitectures').split(',')
}
// When reactNativeArchitectures is empty the ndk block below is a
// no-op — every ABI is built (current default behaviour).

android {
compileSdkVersion rootProject.hasProperty('compileSdkVersion') ? rootProject.compileSdkVersion : DEFAULT_COMPILE_SDK_VERSION
buildToolsVersion rootProject.hasProperty('buildToolsVersion') ? rootProject.buildToolsVersion : DEFAULT_BUILD_TOOLS_VERSION
Expand All @@ -19,6 +33,9 @@ android {
targetSdkVersion rootProject.hasProperty('targetSdkVersion') ? rootProject.targetSdkVersion : DEFAULT_TARGET_SDK_VERSION
versionCode 1
versionName "1.0"
ndk {
abiFilters reactNativeArchitectures
}
externalNativeBuild {
cmake {
// Not sure if this is necessary. I added this in attempt to fix catching
Expand Down