Skip to content

Commit

Permalink
[forwardport] fix(netxlite): remove android-specific errno (ooni#586) (
Browse files Browse the repository at this point in the history
…ooni#587)

This commit forward ports 50ff5f7f60eae344153a0ffb99a53f15b6a974cd from
the `release/3.11` branch to `master`. Here's the original commit message:

- - -

Android is also Linux. The Android build fails because both
errno_linux.go and errno_android.go are compiled.

There's no difference between the files except into a comment
that mentions "linux" or "android".

Therefore, it's safe to remove the android-specific file
and just keep and use the linux-specific one.

Part of ooni/probe#1863, where we're
forward porting ooni/go patches to go1.17.

I'm still trying to figure out whether I can build oonimkall
using the forward ported patches and this error prevents me
from building, because the build fails.

"やれやれだぜ"

Note that this patch WILL need to be forward ported to master.

This bug was previosuly reported to me by @hellais.

Because I did run `go generate ./internal/netxlite/...` we also
get for free updated certificates, which is OK.
  • Loading branch information
bassosimone authored Nov 10, 2021
1 parent 3eea4a3 commit 86e436c
Show file tree
Hide file tree
Showing 15 changed files with 93 additions and 316 deletions.
84 changes: 81 additions & 3 deletions internal/netxlite/certifi.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion internal/netxlite/errno.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

112 changes: 0 additions & 112 deletions internal/netxlite/errno_android.go

This file was deleted.

Loading

0 comments on commit 86e436c

Please sign in to comment.