Skip to content

Commit 78ad083

Browse files
authored
fix(android): allow passing CMAKE_MAKE_PROGRAM to underlying CMake call (#2616)
1 parent 41e9296 commit 78ad083

File tree

1 file changed

+22
-6
lines changed

1 file changed

+22
-6
lines changed

android/app/build.gradle

Lines changed: 22 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -100,12 +100,21 @@ android {
100100
resValue("string", "app_name", project.ext.react.appName)
101101

102102
def cppStd = "-std=c++20"
103+
def cmakeMakeProgram = System.getenv("CMAKE_MAKE_PROGRAM")
104+
103105
if (enableNewArchitecture) {
106+
def cmakeArgs = [
107+
"-DANDROID_STL=c++_shared",
108+
"-DPROJECT_BUILD_DIR=${buildDir}",
109+
"-DREACT_ANDROID_DIR=${reactNativePath}/ReactAndroid",
110+
]
111+
if (cmakeMakeProgram != null) {
112+
cmakeArgs.add("-DCMAKE_MAKE_PROGRAM=${cmakeMakeProgram}")
113+
}
114+
104115
externalNativeBuild {
105116
cmake {
106-
arguments("-DANDROID_STL=c++_shared",
107-
"-DPROJECT_BUILD_DIR=${buildDir}",
108-
"-DREACT_ANDROID_DIR=${reactNativePath}/ReactAndroid")
117+
arguments(*cmakeArgs)
109118
cppFlags(cppStd, "-frtti", "-fexceptions", "-DWITH_INSPECTOR=1")
110119
}
111120
}
@@ -115,11 +124,18 @@ android {
115124
}
116125
}
117126
} else {
127+
def cmakeArgs = [
128+
"-DANDROID_STL=c++_shared",
129+
"-DREACT_COMMON_DIR=${reactNativePath}/ReactCommon",
130+
"-DREACT_JNILIBS_DIR=${buildDir}/outputs/jniLibs",
131+
]
132+
if (cmakeMakeProgram != null) {
133+
cmakeArgs.add("-DCMAKE_MAKE_PROGRAM=${cmakeMakeProgram}")
134+
}
135+
118136
externalNativeBuild {
119137
cmake {
120-
arguments("-DANDROID_STL=c++_shared",
121-
"-DREACT_COMMON_DIR=${reactNativePath}/ReactCommon",
122-
"-DREACT_JNILIBS_DIR=${buildDir}/outputs/jniLibs")
138+
arguments(*cmakeArgs)
123139
cppFlags(cppStd, "-Wall", "-Werror", "-frtti", "-fexceptions", "-DWITH_INSPECTOR=1")
124140
}
125141
}

0 commit comments

Comments
 (0)