Skip to content

Add --android-sdk-version option to cmake-rn #131

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 3 commits into from
Jun 20, 2025
Merged

Add --android-sdk-version option to cmake-rn #131

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5cb8fe8
Add verbose option
kraenhansen Jun 19, 2025
71a8a86
Add Android SDK option
kraenhansen Jun 19, 2025
c45d06f
Merge branch 'main' into kh/cmake-rn/android-sdk
kraenhansen Jun 20, 2025
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
6 changes: 4 additions & 2 deletions packages/cmake-rn/src/android.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,13 @@ export const ANDROID_ARCHITECTURES = {
type AndroidConfigureOptions = {
triplet: AndroidTriplet;
ndkVersion: string;
sdkVersion: string;
};

export function getAndroidConfigureCmakeArgs({
triplet,
ndkVersion,
sdkVersion,
}: AndroidConfigureOptions) {
const { ANDROID_HOME } = process.env;
assert(typeof ANDROID_HOME === "string", "Missing env variable ANDROID_HOME");
Expand Down Expand Up @@ -80,8 +82,8 @@ export function getAndroidConfigureCmakeArgs({
`ANDROID_ABI=${architecture}`,
"-D",
"ANDROID_TOOLCHAIN=clang",
// "-D",
// `ANDROID_NATIVE_API_LEVEL=${ANDROID_API_LEVEL}`,
"-D",
`ANDROID_PLATFORM=${sdkVersion}`,
"-D",
"ANDROID_STL=c++_shared",
// Pass linker flags to avoid errors from undefined symbols
Expand Down
18 changes: 17 additions & 1 deletion packages/cmake-rn/src/cli.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ EventEmitter.defaultMaxListeners = 100;

// This should match https://github.com/react-native-community/template/blob/main/template/android/build.gradle#L7
const DEFAULT_NDK_VERSION = "27.1.12297006";
const DEFAULT_ANDROID_SDK_VERSION = "24";

// TODO: Add automatic ccache support

Expand Down Expand Up @@ -88,6 +89,11 @@ const ndkVersionOption = new Option(
"The NDK version to use for Android builds"
).default(DEFAULT_NDK_VERSION);

const androidSdkVersionOption = new Option(
"--android-sdk-version <version>",
"The Android SDK version to use for Android builds"
).default(DEFAULT_ANDROID_SDK_VERSION);

const noAutoLinkOption = new Option(
"--no-auto-link",
"Don't mark the output as auto-linkable by react-native-node-api"
Expand Down Expand Up @@ -115,6 +121,7 @@ export const program = new Command("cmake-rn")
.addOption(outPathOption)
.addOption(cleanOption)
.addOption(ndkVersionOption)
.addOption(androidSdkVersionOption)
.addOption(noAutoLinkOption)
.addOption(noWeakNodeApiLinkageOption)
.addOption(xcframeworkExtensionOption)
Expand Down Expand Up @@ -348,12 +355,19 @@ function getTripletBuildPath(buildPath: string, triplet: SupportedTriplet) {

function getTripletConfigureCmakeArgs(
triplet: SupportedTriplet,
{ ndkVersion }: Pick<GlobalContext, "ndkVersion" | "weakNodeApiLinkage">
{
ndkVersion,
androidSdkVersion,
}: Pick<
GlobalContext,
"ndkVersion" | "androidSdkVersion" | "weakNodeApiLinkage"
>
) {
if (isAndroidTriplet(triplet)) {
return getAndroidConfigureCmakeArgs({
triplet,
ndkVersion,
sdkVersion: androidSdkVersion,
});
} else if (isAppleTriplet(triplet)) {
return getAppleConfigureCmakeArgs({ triplet });
Expand All @@ -379,6 +393,7 @@ async function configureProject(context: TripletScopedContext) {
tripletBuildPath,
source,
ndkVersion,
androidSdkVersion,
weakNodeApiLinkage,
} = context;
await spawn(
Expand All @@ -392,6 +407,7 @@ async function configureProject(context: TripletScopedContext) {
...getTripletConfigureCmakeArgs(triplet, {
ndkVersion,
weakNodeApiLinkage,
androidSdkVersion,
}),
],
{
Expand Down
Loading