Skip to content

gh-131531: Add android.py package command #131532

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.

Sign up for GitHub

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
freakboy3742 merged 8 commits into from
Apr 1, 2025
Merged

gh-131531: Add android.py package command #131532

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
cabe9ec
Move Android `build` and `prefix` directories from `cross-build` to `…
mhsmith Mar 20, 2025
a467f0a
Add `android.py package` command
mhsmith Mar 20, 2025
94a1b8e
Python 3.13 doesn't have the sysconfig json file, so use patchlevel.h…
mhsmith Mar 21, 2025
4b2b9d7
Clarify comments
mhsmith Mar 21, 2025
5064b8f
Download gradle-wrapper.jar directly from Gradle's GitHub repository,…
mhsmith Mar 27, 2025
3dc41cb
Move directories back to `cross-build`, and make the testbed handle b…
mhsmith Mar 29, 2025
150137f
Merge branch 'main' into android-package
mhsmith Mar 29, 2025
c537d97
Remove extra `build` level in directory structure
mhsmith Mar 31, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Download gradle-wrapper.jar directly from Gradle's GitHub repository,… 
… rather than extracting it from a Gradle release
  • Loading branch information
@mhsmith
mhsmith committed Mar 28, 2025
commit 5064b8f5763e343a68a47cfd1d7d3ac26017d63d
1 change: 0 additions & 1 deletion Android/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ The `android.py` script also requires the following commands to be on the `PATH`
* `curl`
* `java` (or set the `JAVA_HOME` environment variable)
* `tar`
* `unzip`


## Building
Expand Down
36 changes: 16 additions & 20 deletions Android/android.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -241,31 +241,27 @@ def setup_sdk():

# To avoid distributing compiled artifacts without corresponding source code,
# the Gradle wrapper is not included in the CPython repository. Instead, we
# extract it from the Gradle release.
# extract it from the Gradle GitHub repository.
def setup_testbed():
if all((TESTBED_DIR / path).exists() for path in [
"gradlew", "gradlew.bat", "gradle/wrapper/gradle-wrapper.jar",
]):
# The Gradle version used for the build is specified in
# testbed/gradle/wrapper/gradle-wrapper.properties. This wrapper version
# doesn't need to match, as any version of the wrapper can download any
# version of Gradle.
version = "8.9.0"
paths = ["gradlew", "gradlew.bat", "gradle/wrapper/gradle-wrapper.jar"]

if all((TESTBED_DIR / path).exists() for path in paths):
return

ver_long = "8.7.0"
ver_short = ver_long.removesuffix(".0")

for filename in ["gradlew", "gradlew.bat"]:
out_path = download(
f"https://raw.githubusercontent.com/gradle/gradle/v{ver_long}/{filename}",
TESTBED_DIR)
for path in paths:
out_path = TESTBED_DIR / path
out_path.parent.mkdir(exist_ok=True)
download(
f"https://raw.githubusercontent.com/gradle/gradle/v{version}/{path}",
out_path.parent,
)
os.chmod(out_path, 0o755)

with TemporaryDirectory(prefix=SCRIPT_NAME) as temp_dir:
bin_zip = download(
f"https://services.gradle.org/distributions/gradle-{ver_short}-bin.zip",
temp_dir)
outer_jar = f"gradle-{ver_short}/lib/plugins/gradle-wrapper-{ver_short}.jar"
run(["unzip", "-d", temp_dir, bin_zip, outer_jar])
run(["unzip", "-o", "-d", f"{TESTBED_DIR}/gradle/wrapper",
f"{temp_dir}/{outer_jar}", "gradle-wrapper.jar"])


# run_testbed will build the app automatically, but it's useful to have this as
# a separate command to allow running the app outside of this script.
Expand Down