Skip to content
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

M1 CMake #1545

Closed
Tracked by #1299
DanAlbert opened this issue Jul 26, 2021 · 6 comments
Closed
Tracked by #1299

M1 CMake #1545

DanAlbert opened this issue Jul 26, 2021 · 6 comments
Assignees

Comments

@DanAlbert
Copy link
Member

Subtask for #1299

@rprichard
Copy link
Collaborator

This CL enables universal builds for cmake in kokoro. We still need to switch ninja over (#1548), update prebuilts, and ship a new Android SDK cmake package containing M1 cmake and ninja.

https://android-review.googlesource.com/c/platform/external/cmake/+/1809106

@DanAlbert
Copy link
Member Author

(removing from the project because this isn't tied to an NDK release, it's in the SDK)

@rprichard
Copy link
Collaborator

CMake 3.22.1 is now available in the SDK Manager's canary channel. This build of CMake contains universal (arm64 + x86_64) binaries for macOS.

@DanAlbert DanAlbert mentioned this issue Jan 27, 2022
@DanAlbert
Copy link
Member Author

AGP 7.3 Canary 8 should use CMake 3.22.1 by default. We'll give that some soak time (unsure how long we ought to wait, but probably not more than a month) and then promote it to the stable channel.

bootstraponline pushed a commit to Flank/mirror-goog-studio-main that referenced this issue Apr 21, 2022
Test: treehugger
Bug: android/ndk#1545
Bug: android/ndk#1548

Change-Id: I029f9fa6bc01702d13b4e8b4545f6460f5cfa759
@DanAlbert
Copy link
Member Author

The CMake binaries aren't likely to change before being pushed to stable, but we haven't made that push since #1693 is awful surprising behavior for users and we need to ship NDK updates that opt-out by default before we can safely promote CMake 3.22 to stable. r23c and r25 beta 4 have the workaround already, but r24 does not. We'll push to stable once either r24b ships with this fix (release is delayed waiting for toolchain fixes) or r24 reaches EOL (which won't be sooner than July).

@DanAlbert
Copy link
Member Author

Okay, now that r25 ks out, CMake 3.22.1 is in the stable channel.

AGP's default still needs to be updated.

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

No branches or pull requests

2 participants