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

Fix android armeabi-v7a constraint #15248

Closed

Conversation

keith
Copy link
Member

@keith keith commented Apr 13, 2022

Previously this was arm instead of armv7. It seems that armv7 is the
correct constraint for this case.

Fixes #14982

@keith keith requested review from ahumesky and ted-xie as code owners April 13, 2022 22:54
@keith keith force-pushed the ks/fix-android-armeabi-v7a-constraint branch 4 times, most recently from adbc734 to 4cb7f0f Compare April 14, 2022 00:24
Previously this was arm instead of armv7. It seems that armv7 is the
correct constraint for this case.

Fixes bazelbuild#14982
@keith keith force-pushed the ks/fix-android-armeabi-v7a-constraint branch from 4cb7f0f to a8680ca Compare April 14, 2022 16:47
@ahumesky ahumesky added the team-Android Issues for Android team label Apr 15, 2022
@katre katre self-requested a review April 19, 2022 15:49
@katre
Copy link
Member

katre commented Apr 19, 2022

Taking a look at this. This does seem like a promising fix for #14982, and is the PR I was recalling to @gregce (comment #14982 (comment)).

The big question is to find out how this will work with our internal Android processes, I'm going to import this and run a lot of tests, I'll report back when that's done (it may be a few days).

"armeabi-v7a": ["@platforms//cpu:armv7"],
"armeabi-v7a": [
"@platforms//cpu:armv7",
"@platforms//os:android",
Copy link
Member

Choose a reason for hiding this comment

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

This can't be right, shouldn't this be osx?

Copy link
Member Author

Choose a reason for hiding this comment

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

IIUC this CPU is just a shim because the android SDK requires it to exist even if it isn't valid. With the macOS toolchain it will actually just generate a dummy toolchain that does nothing. #13449

I tried to remove it entirely again recently, but it's still hit in some cases #14872

Copy link
Member

Choose a reason for hiding this comment

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

I see, thanks for explaining.

@katre
Copy link
Member

katre commented Apr 21, 2022

Ran the internal tests and, as I suspected, there's no impact. I'm going to work on getting this submitted in the next few days.

@bazel-io bazel-io closed this in 46e0be4 Apr 25, 2022
@keith keith deleted the ks/fix-android-armeabi-v7a-constraint branch April 25, 2022 15:53
@cpsauer
Copy link
Contributor

cpsauer commented Apr 26, 2022

Yay, @keith! Yay, @katre!

ckolli5 added a commit that referenced this pull request May 10, 2022
Previously this was arm instead of armv7. It seems that armv7 is the
correct constraint for this case.

Fixes #14982

Closes #15248.

PiperOrigin-RevId: 444250195

Co-authored-by: Keith Smiley <keithbsmiley@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
team-Android Issues for Android team
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Android NDK 32 bit Arm should be marked "armv7" not "arm"
4 participants