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

matrix #4253

Open
wants to merge 10 commits into
base: master
Choose a base branch
from
Open

matrix #4253

wants to merge 10 commits into from

Conversation

UjuiUjuMandan
Copy link
Contributor

@UjuiUjuMandan UjuiUjuMandan commented Jan 11, 2025

See:

The bug is like this:

When the filter contains than one ABI, all APK's some .dex files will get a same versionCode, their AndroidManifest.xml get the correct and according one though.

workaround for gitlab.com/fdroid/fdroiddata/-/issues/2998#note_1405234894
@2dust
Copy link
Owner

2dust commented Jan 11, 2025

I think you made the script too complicated.
Please don't put the ABI in this script

@2dust
Copy link
Owner

2dust commented Jan 11, 2025

libhysteria2's script is a standalone one.

@UjuiUjuMandan UjuiUjuMandan reopened this Jan 11, 2025
@UjuiUjuMandan
Copy link
Contributor Author

Please don't put the ABI in this script

Sorry?

@UjuiUjuMandan
Copy link
Contributor Author

UjuiUjuMandan commented Jan 11, 2025

libhysteria2's script is a standalone one.

I'll specific the ABI in its command parameter instead.

Better to do this for libtun2socks too.

@UjuiUjuMandan
Copy link
Contributor Author

The universal APK will not be built or uploaded at all now.

@UjuiUjuMandan
Copy link
Contributor Author

The universal APK will not be built or uploaded at all now.

It can still be built locally, if no gradlew parameter was provided.

@2dust
Copy link
Owner

2dust commented Jan 11, 2025

The compile-tun2socks.sh and libhysteria2.sh scripts should be run independently to complete their work.
The scripts before this PR are good enough.
build.gradle.kts also needs to work independently without github, and the ABI in it should not be removed.

@UjuiUjuMandan
Copy link
Contributor Author

UjuiUjuMandan commented Jan 11, 2025

The compile-tun2socks.sh and libhysteria2.sh scripts should be run independently to complete their work.

They will compile all ABIs, just like before if no parameter was provided.

The scripts before this PR are good enough.

I don't think so, considering that bug is preventing it from being reproducible. And, building different ABIs in parallel will probably save some time.

build.gradle.kts also needs to work independently without github, and the ABI in it should not be removed.

OK.

@UjuiUjuMandan
Copy link
Contributor Author

UjuiUjuMandan commented Jan 11, 2025

The scripts before this PR are good enough.

OK, you're right at build.gradle.kts. I just reviewed that and got to know I don't need to change it at all.

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