Skip to content

[libc++][Android] Disable Android ABI list checking #69666

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

Merged
merged 1 commit into from
Oct 20, 2023

Conversation

rprichard
Copy link
Contributor

Issue: #69270

@rprichard rprichard requested a review from a team as a code owner October 20, 2023 00:43
@llvmbot llvmbot added the libc++ libc++ C++ Standard Library. Not GNU libstdc++. Not libc++abi. label Oct 20, 2023
@llvmbot
Copy link
Member

llvmbot commented Oct 20, 2023

@llvm/pr-subscribers-libcxx

Author: Ryan Prichard (rprichard)

Changes

Issue: #69270


Full diff: https://github.com/llvm/llvm-project/pull/69666.diff

1 Files Affected:

  • (modified) libcxx/utils/ci/run-buildbot (-1)
diff --git a/libcxx/utils/ci/run-buildbot b/libcxx/utils/ci/run-buildbot
index 69ad58ed079ea01..be96bb65ef94122 100755
--- a/libcxx/utils/ci/run-buildbot
+++ b/libcxx/utils/ci/run-buildbot
@@ -738,7 +738,6 @@ android-ndk-*)
                            -DCMAKE_SYSROOT=/opt/android/ndk/sysroot \
                            -DLIBCXX_TEST_PARAMS="${PARAMS}" \
                            -DLIBCXXABI_TEST_PARAMS="${PARAMS}"
-    check-abi-list
     ${NINJA} -vC "${BUILD_DIR}" install-cxx install-cxxabi
 
     # Start the emulator and make sure we can connect to the adb server running

@rprichard
Copy link
Contributor Author

It wasn't quite clear to me if we should have these ABI lists for Android, so I thought we might leave them out for the moment, #69272 (comment).

@ldionne
Copy link
Member

ldionne commented Oct 20, 2023

@rprichard I kinda lost track here, but can you please make sure to cross-reference any Phabricator review from the PRs and vice-versa, and also abandon any Phabricator review that you are moving to github PRs?

@ldionne
Copy link
Member

ldionne commented Oct 20, 2023

It wasn't quite clear to me if we should have these ABI lists for Android, so I thought we might leave them out for the moment, #69272 (comment).

You folks want to be ABI stable or not? If you want to be ABI stable, then you should have these ABI lists.

@rprichard
Copy link
Contributor Author

@rprichard I kinda lost track here, but can you please make sure to cross-reference any Phabricator review from the PRs and vice-versa, and also abandon any Phabricator review that you are moving to github PRs?

Sorry about that. The GitHub commits/PRs all referenced Phabricator reviews where it made sense. Two Phabricator reviews were closed when the PRs merged, and one was still open, so I abandoned it.

@ldionne
Copy link
Member

ldionne commented Oct 20, 2023

It's all good, no worries -- I just wanted to make sure but I appreciate that you already took care of everything!

@EricWF
Copy link
Member

EricWF commented Oct 20, 2023

@ldionne Sorry about the lack of cross references between the old and new patches. That was partially my doing.

This LGTM. Merging.

@EricWF EricWF merged commit 07ba499 into llvm:main Oct 20, 2023
@ldionne
Copy link
Member

ldionne commented Oct 20, 2023

@EricWF I don't mind the cross references, but please be careful when you merge, we had a discussion started above (#69666 (comment)). I suspect that Android actually does want the ABI testing.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
libc++ libc++ C++ Standard Library. Not GNU libstdc++. Not libc++abi. platform:android
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants