Skip to content

Commit

Permalink
RDART-1022: Drop x86 as target (#1682)
Browse files Browse the repository at this point in the history
* 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
  • Loading branch information
nielsenko authored May 23, 2024
1 parent ca52b2a commit 4f55de7
Show file tree
Hide file tree
Showing 7 changed files with 5 additions and 31 deletions.
6 changes: 0 additions & 6 deletions .github/workflows/binary-combine-android.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,6 @@ jobs:
timeout-minutes: 15
runs-on: ubuntu-latest
steps:
- name: Fetch x86 build
uses: actions/download-artifact@v4
with:
name: librealm-android-x86
path: packages/realm_dart/binary/android
- name: Fetch x86_64 build
uses: actions/download-artifact@v4
with:
Expand Down Expand Up @@ -41,7 +36,6 @@ jobs:
uses: geekyeggo/delete-artifact@v4
with:
name: |
librealm-android-x86
librealm-android-x86_64
librealm-android-armeabi-v7a
librealm-android-arm64-v8a
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ jobs:
with:
runner: ubuntu-20.04
binary: android
build: '["android-x86", "android-x86_64", "android-armeabi-v7a", "android-arm64-v8a"]'
build: '["android-x86_64", "android-armeabi-v7a", "android-arm64-v8a"]'

build-ios:
name: Build IOS
Expand Down
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@

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

## 2.2.0 (2024-05-01)

Expand Down
14 changes: 0 additions & 14 deletions packages/realm_dart/CMakePresets.json
Original file line number Diff line number Diff line change
Expand Up @@ -87,14 +87,6 @@
"ANDROID_NDK_HOME": "$env{ANDROID_NDK}"
}
},
{
"name": "android-x86",
"displayName": "Android x86",
"inherits": "android",
"cacheVariables": {
"CMAKE_ANDROID_ARCH_ABI": "x86"
}
},
{
"name": "android-x86_64",
"displayName": "Android x86_64",
Expand Down Expand Up @@ -138,12 +130,6 @@
"displayName": "x64",
"configuration": "Debug"
},
{
"name": "android-x86",
"configurePreset": "android-x86",
"displayName": "x86",
"configuration": "Debug"
},
{
"name": "android-x86_64",
"configurePreset": "android-x86_64",
Expand Down
1 change: 0 additions & 1 deletion packages/realm_dart/dev/lib/src/build.dart
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,6 @@ enum OS {
enum Target {
androidArm(Architecture.arm, OS.android),
androidArm64(Architecture.arm64, OS.android),
androidIA32(Architecture.ia32, OS.android),
androidX64(Architecture.x64, OS.android), // only for emulator
// androidRiscv64, // not supported by realm currently
// fuchsiaArm64, // -"- etc.
Expand Down
6 changes: 3 additions & 3 deletions packages/realm_dart/scripts/build-android.sh
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,11 @@ fi
# Start in the root directory of the project.
cd "$(dirname "$0")/.."

ABIS=(x86 x86_64 armeabi-v7a arm64-v8a)
ABIS=(x86_64 armeabi-v7a arm64-v8a)

# only building for x86 if no arguments
# only building for arm64-v8a if no arguments
if [ $# -eq 0 ]; then
ABIS=(x86)
ABIS=arm64-v8a)
fi

for abi in "${ABIS[@]}"; do
Expand Down
6 changes: 0 additions & 6 deletions packages/realm_dart/src/realm_dart.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -35,12 +35,6 @@ std::string cpuArch = "arm64";
#pragma message("Building arm64")
#endif


#if REALM_ARCHITECTURE_X86_32
std::string cpuArch = "x86";
#pragma message("Building x86")
#endif

#if REALM_ARCHITECTURE_X86_64
std::string cpuArch = "x86_64";
#pragma message("Building x64")
Expand Down

0 comments on commit 4f55de7

Please sign in to comment.