Skip to content

Commit c5e3ef9

Browse files
Fix: Linking during Android build for new arch (#597)
* Ingore Cxx build results in Android * Do not include unused and non-existng package in linking * Introduce new arch for Android build in CI checks * Use more explicit naming for new-arch gradle prop cache * Use old arch by default * Test the old and new arch CI checks The CI check should fail, but only for the new arch check for Android. Old arch should still succeed. This commit TEMPORARILY reverts the main fix for the issue. * Revert "Test the old and new arch CI checks" This reverts commit 2e49aa8.
1 parent 66fd13a commit c5e3ef9

3 files changed

Lines changed: 28 additions & 3 deletions

File tree

.github/workflows/ReactNativeSlider-CI.yml

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,33 @@ jobs:
108108
- name: Build the Android OS app
109109
run: cd example/android && ./gradlew assembleDebug
110110

111+
build-android-app-new-arch:
112+
name: Build example app Android (Fabric)
113+
runs-on: ubuntu-latest
114+
needs: [build-android-app]
115+
116+
steps:
117+
- uses: actions/checkout@v4
118+
119+
- name: Pull the npm dependencies
120+
run: npm install
121+
122+
- uses: actions/setup-java@v4
123+
with:
124+
distribution: 'zulu'
125+
java-version: '17'
126+
127+
- name: Use new arch config
128+
id: cache-new-arch-gradle
129+
uses: actions/cache@v4
130+
env:
131+
cache-name: cached-gradle-new-arch-prop
132+
with:
133+
path: example/android/gradle.properties
134+
key: gradle-prop-new-arch-config
135+
136+
- name: Build the Android OS app
137+
run: cd example/android && ./gradlew assembleDebug
111138

112139
build-iOS-app:
113140
name: Build example app iOS

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ build/
3434
.gradle
3535
local.properties
3636
*.iml
37+
.cxx
3738

3839
# node.js
3940
#

package/android/src/main/jni/CMakeLists.txt

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,13 +51,10 @@ target_link_libraries(
5151
react_render_graphics
5252
react_render_imagemanager
5353
react_render_mapbuffer
54-
react_render_textlayoutmanager
5554
react_utils
5655
react_nativemodule_core
5756
rrc_image
5857
turbomodulejsijni
59-
rrc_text
60-
rrc_textinput
6158
rrc_view
6259
yoga
6360
)

0 commit comments

Comments
 (0)