Skip to content

Commit 4f55de7

Browse files
author
Kasper Overgård Nielsen
authored
RDART-1022: Drop x86 as target (#1682)
* Update realm-core to v14.7.0 * Tweak expected error message * Update CHANGELOG * Revert "Don't downgrade xcode (#1649)" This reverts commit bcb9b22. * Update tests to match new 401 messages * Oldest version of XCode on macos-14 runner is 14.3.1 * Drop x86 as target * Update CHANGELOG * Update CI and cmake presets
1 parent ca52b2a commit 4f55de7

File tree

7 files changed

+5
-31
lines changed

7 files changed

+5
-31
lines changed

.github/workflows/binary-combine-android.yml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,6 @@ jobs:
99
timeout-minutes: 15
1010
runs-on: ubuntu-latest
1111
steps:
12-
- name: Fetch x86 build
13-
uses: actions/download-artifact@v4
14-
with:
15-
name: librealm-android-x86
16-
path: packages/realm_dart/binary/android
1712
- name: Fetch x86_64 build
1813
uses: actions/download-artifact@v4
1914
with:
@@ -41,7 +36,6 @@ jobs:
4136
uses: geekyeggo/delete-artifact@v4
4237
with:
4338
name: |
44-
librealm-android-x86
4539
librealm-android-x86_64
4640
librealm-android-armeabi-v7a
4741
librealm-android-arm64-v8a

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ jobs:
4545
with:
4646
runner: ubuntu-20.04
4747
binary: android
48-
build: '["android-x86", "android-x86_64", "android-armeabi-v7a", "android-arm64-v8a"]'
48+
build: '["android-x86_64", "android-armeabi-v7a", "android-arm64-v8a"]'
4949

5050
build-ios:
5151
name: Build IOS

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929

3030
### Internal
3131
* Using Core 14.6.2.
32+
* Drop build of `x86` android slice. (Issue [#1670](https://github.com/realm/realm-dart/issues/1670))
3233

3334
## 2.2.0 (2024-05-01)
3435

packages/realm_dart/CMakePresets.json

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -87,14 +87,6 @@
8787
"ANDROID_NDK_HOME": "$env{ANDROID_NDK}"
8888
}
8989
},
90-
{
91-
"name": "android-x86",
92-
"displayName": "Android x86",
93-
"inherits": "android",
94-
"cacheVariables": {
95-
"CMAKE_ANDROID_ARCH_ABI": "x86"
96-
}
97-
},
9890
{
9991
"name": "android-x86_64",
10092
"displayName": "Android x86_64",
@@ -138,12 +130,6 @@
138130
"displayName": "x64",
139131
"configuration": "Debug"
140132
},
141-
{
142-
"name": "android-x86",
143-
"configurePreset": "android-x86",
144-
"displayName": "x86",
145-
"configuration": "Debug"
146-
},
147133
{
148134
"name": "android-x86_64",
149135
"configurePreset": "android-x86_64",

packages/realm_dart/dev/lib/src/build.dart

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,6 @@ enum OS {
6868
enum Target {
6969
androidArm(Architecture.arm, OS.android),
7070
androidArm64(Architecture.arm64, OS.android),
71-
androidIA32(Architecture.ia32, OS.android),
7271
androidX64(Architecture.x64, OS.android), // only for emulator
7372
// androidRiscv64, // not supported by realm currently
7473
// fuchsiaArm64, // -"- etc.

packages/realm_dart/scripts/build-android.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,11 @@ fi
2121
# Start in the root directory of the project.
2222
cd "$(dirname "$0")/.."
2323

24-
ABIS=(x86 x86_64 armeabi-v7a arm64-v8a)
24+
ABIS=(x86_64 armeabi-v7a arm64-v8a)
2525

26-
# only building for x86 if no arguments
26+
# only building for arm64-v8a if no arguments
2727
if [ $# -eq 0 ]; then
28-
ABIS=(x86)
28+
ABIS=arm64-v8a)
2929
fi
3030

3131
for abi in "${ABIS[@]}"; do

packages/realm_dart/src/realm_dart.cpp

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -35,12 +35,6 @@ std::string cpuArch = "arm64";
3535
#pragma message("Building arm64")
3636
#endif
3737

38-
39-
#if REALM_ARCHITECTURE_X86_32
40-
std::string cpuArch = "x86";
41-
#pragma message("Building x86")
42-
#endif
43-
4438
#if REALM_ARCHITECTURE_X86_64
4539
std::string cpuArch = "x86_64";
4640
#pragma message("Building x64")

0 commit comments

Comments
 (0)