Skip to content

Commit

Permalink
fix: CMake flags (#2603)
Browse files Browse the repository at this point in the history
# Summary

Fix typo in CMakeLists.txt flags and use `ReactAndroid_VERSION_MINOR`
instead of `REACT_NATIVE_MINOR_VERSION`

## Test Plan

Example apps should build without warnings/errors on 0.73+ as well as on
0.77.0-rc.6
  • Loading branch information
jakex7 authored Jan 8, 2025
1 parent d888de9 commit 73bdb03
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 8 deletions.
7 changes: 0 additions & 7 deletions android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -104,13 +104,6 @@ android {
buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled().toString()

consumerProguardFiles 'proguard-rules.pro'

buildConfigField("String", "REACT_NATIVE_MINOR_VERSION", "\"${REACT_NATIVE_MINOR_VERSION}\"")
externalNativeBuild {
cmake {
arguments "-DREACT_NATIVE_MINOR_VERSION=${REACT_NATIVE_MINOR_VERSION}"
}
}
}
lintOptions {
abortOnError false
Expand Down
2 changes: 1 addition & 1 deletion android/src/main/jni/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ set(RNS_GENERATED_REACT_DIR ${RNS_GENERATED_JNI_DIR}/react/renderer/components/r
string(
APPEND
CMAKE_CXX_FLAGS
" -DREACT_NATIVE_MINOR_VERSION=321${REACT_NATIVE_MINOR_VERSION}")
" -DREACT_NATIVE_MINOR_VERSION=${ReactAndroid_VERSION_MINOR}")

add_compile_options(
-fexceptions
Expand Down

0 comments on commit 73bdb03

Please sign in to comment.