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 script to build without gradle #2850

Merged
merged 2 commits into from
Dec 3, 2021
Merged

Fix script to build without gradle #2850

merged 2 commits into from
Dec 3, 2021

Conversation

rom1v
Copy link
Collaborator

@rom1v rom1v commented Dec 2, 2021

The PLATFORM variable is assigned either from $ANDROID_PLATFORM or gets a default value (currently $PLATFORM_VERSION).

The check to use either dx (SDK < 31) or d8 (SDK >= 31) must be based on the actual $PLATFORM, not the default $PLATFORM_VERSION.

Refs 52138fd
Refs https://salsa.debian.org/yangfl-guest/scrcpy/-/blob/57d30780dd38b9641992a873d760ac0f4bc3a387/debian/patches/0002-Workaround-broken-script.patch


@yangfl Thank you for the debian package 👍 I noticed the problem by looking at your workaround, so I submit the patch with your authorship.

(Note: it seems that you forgot to create a tag debian/1.21-1.)

yangfl and others added 2 commits December 3, 2021 21:46
The PLATFORM variable is assigned either from $ANDROID_PLATFORM or gets
a default value (currently $PLATFORM_VERSION).

The check to use either dx (SDK < 31) or d8 (SDK >= 31) must be based on
the actual $PLATFORM, not the default $PLATFORM_VERSION.

Refs 52138fd
Refs <https://salsa.debian.org/yangfl-guest/scrcpy/-/blob/57d30780dd38b9641992a873d760ac0f4bc3a387/debian/patches/0002-Workaround-broken-script.patch>

PR #2850 <#2850>

Signed-off-by: Romain Vimont <rom@rom1v.com>
Now that PLATFORM is correctly used in the if-condition,
PLATFORM_VERSION is useless.

PR #2850 <#2850>
@rom1v rom1v merged commit a208400 into dev Dec 3, 2021
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