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
Clarify comments
  • Loading branch information
@mhsmith
mhsmith committed Mar 21, 2025
commit 4b2b9d7afee1e12b35b1cf897f18f00d655d4710
7 changes: 4 additions & 3 deletions Android/android.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -574,7 +574,7 @@ def package(context):
with TemporaryDirectory(prefix=SCRIPT_NAME) as temp_dir:
temp_dir = Path(temp_dir)

# All tracked files in the Android directory.
# Include all tracked files from the Android directory.
for line in run(
["git", "ls-files"],
cwd=ANDROID_DIR, capture_output=True, text=True, log=False,
Expand All @@ -584,8 +584,9 @@ def package(context):
dst.parent.mkdir(parents=True, exist_ok=True)
shutil.copy2(src, dst, follow_symlinks=False)

# Anything in the prefix directory which could be useful either for
# apps embedding Python, or packages built against it.
# Include anything from the prefix directory which could be useful
# either for embedding Python in an app, or building third-party
# packages against it.
for rel_dir, patterns in [
("include", ["openssl*", "python*", "sqlite*"]),
("lib", ["engines-3", "libcrypto*.so", "libpython*", "libsqlite*",
Expand Down
4 changes: 2 additions & 2 deletions Android/testbed/app/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,15 +147,15 @@ androidComponents.onVariants { variant ->

into("lib/$pyPlusVer") {
// To aid debugging, the source directory takes priority when
// running inside a Python source tree.
// running inside a CPython source tree.
if (
file(ANDROID_DIR).name == "Android"
&& file("$ANDROID_DIR/../pyconfig.h.in").exists()
) {
from("$ANDROID_DIR/../Lib")
}

// The predix directory provides ABI-specific files such as
// The prefix directory provides ABI-specific files such as
// sysconfigdata.
for (triplet in ABIS.values) {
from("$PREFIX_DIR/$triplet/lib/$pyPlusVer")
Expand Down
Loading