Skip to content

Fix Apple and Android tools for m137 #32

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.

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

Open
wants to merge 15 commits into
base: main
Choose a base branch
from
Open

Conversation

pblazej
Copy link

@pblazej pblazej commented Jun 18, 2025

  • Fixes Android patches (mocks, prefixing)
  • Adds Apple prefix patch
  • Adds some CI infrastructure that binds "aggregate" apple(_prefixed) targets with xcframework stuff
    • I avoided the full-matrix approach here, as it's both wasteful (multiple pulls/syncs), plus the framework still needs some post-processing

@pblazej pblazej changed the title Fix patches for m137 Fix Android tools for m137 Jun 23, 2025
@pblazej pblazej force-pushed the blaze/m137-patching branch 4 times, most recently from 522e9ab to 0497c0c Compare June 26, 2025 08:49
@pblazej pblazej marked this pull request as ready for review June 26, 2025 11:50
@davidliu
Copy link
Contributor

@pblazej pushed fixes for the android prefixed build

@davidliu
Copy link
Contributor

Whoops, forgot to mention that the VERSION file holds the commit that the CI uses by default. I've updated the commit to point at the blaze/m137-patching now for testing.

@pblazej
Copy link
Author

pblazej commented Jul 8, 2025

Yup @davidliu it does the trick https://github.com/webrtc-sdk/webrtc-build/actions/runs/16111693894. Thanks a lot for taking a look! It should be ready for integration testing on Android then, right?

@davidliu
Copy link
Contributor

davidliu commented Jul 8, 2025

I ran through some small testing with the build last week and seemed to work fine. Should be good to go.

@pblazej
Copy link
Author

pblazej commented Jul 8, 2025

BTW @davidliu which platforms are actually used here (I mean linux and rasp ones)

windows_x86_64, windows_arm64, macos_x86_64, macos_arm64, ubuntu-18.04_x86_64, ubuntu-20.04_x86_64, ubuntu-22.04_x86_64, ubuntu-18.04_armv8, ubuntu-20.04_armv8, raspberry-pi-os_armv6, raspberry-pi-os_armv7, raspberry-pi-os_armv8, android, android_prefixed, ios

I'll be probably doing another round of cleanup + final Apple script.

@pblazej pblazej force-pushed the blaze/m137-patching branch 5 times, most recently from 5a083c8 to 47bd647 Compare July 9, 2025 09:27
@pblazej pblazej force-pushed the blaze/m137-patching branch from 47bd647 to b1b5fef Compare July 9, 2025 09:29
@pblazej pblazej force-pushed the blaze/m137-patching branch from e720003 to b0ea15f Compare July 9, 2025 11:46
@pblazej pblazej force-pushed the blaze/m137-patching branch from 32365ea to e43106a Compare July 9, 2025 13:16
@pblazej pblazej changed the title Fix Android tools for m137 Fix Apple and Android tools for m137 Jul 9, 2025
@pblazej
Copy link
Author

pblazej commented Jul 9, 2025

@hiroshihorie I'm almost there with the build script, fixing the paths and misc stuff. Feel free to take a look, especially at global configs and build flags - is it 100% consistent with what you've used?

Once we get the artifact, we can try automating the push to https://github.com/livekit/webrtc-xcframework, or at least use consistent release numbers (based on tags like @davidliu did here) with Android, still pushing to the above repo manually and copying the hash, etc.

@pblazej pblazej requested a review from hiroshihorie July 9, 2025 13:30
@pblazej
Copy link
Author

pblazej commented Jul 9, 2025

Looks like it builds for iOS 🎉 https://github.com/webrtc-sdk/webrtc-build/actions/runs/16170404165 so the rest is a matter of the script itself

@pblazej pblazej requested a review from davidliu July 10, 2025 06:58
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We can do some cleanup in this file, mostly unused platforms, then remove "old" macOS/iOS stuff from run.py

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants