Skip to content

gh-146450: Ensure Android gradle build uses custom cross-build dir #148319

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 6 commits into from
Apr 12, 2026
+18 −40
Merged

gh-146450: Ensure Android gradle build uses custom cross-build dir #148319

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
871d87f
Ensure gradle uses custom cross-build dir.
freakboy3742 Apr 9, 2026
7afb698
Pass CROSS_BUILD_DIR to gradle environment.
freakboy3742 Apr 9, 2026
db873ac
Ensure testbed builds also get the cross-build environment.
freakboy3742 Apr 9, 2026
68ba1d7
Allow for cross-build to be absolute.
freakboy3742 Apr 10, 2026
f3d4fe8
Simplify interpretation of CROSS_BUILD_DIR
freakboy3742 Apr 11, 2026
030c9bd
Remove build-testbed command, ensure cross-build-dir is on all commands.
freakboy3742 Apr 11, 2026
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
13 changes: 12 additions & 1 deletion Android/android.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -398,9 +398,15 @@ def setup_testbed():
def build_testbed(context):
setup_sdk()
setup_testbed()

# Ensure that CROSS_BUILD_DIR is in the Gradle environment, regardless
# of whether it was set by environment variable or `--cross-build-dir`.
env = os.environ.copy()
env["CROSS_BUILD_DIR"] = CROSS_BUILD_DIR
Comment thread
mhsmith marked this conversation as resolved.
Outdated
run(
[gradlew, "--console", "plain", "packageDebug", "packageDebugAndroidTest"],
cwd=TESTBED_DIR,
env=env,
)


Expand Down Expand Up @@ -645,6 +651,10 @@ async def gradle_task(context):
task_prefix = "connected"
env["ANDROID_SERIAL"] = context.connected

# Ensure that CROSS_BUILD_DIR is in the Gradle environment, regardless
# of whether it was set by environment variable or `--cross-build-dir`.
env["CROSS_BUILD_DIR"] = CROSS_BUILD_DIR

if context.ci_mode:
context.args[0:0] = [
# See _add_ci_python_opts in libregrtest/main.py.
Expand Down Expand Up @@ -896,7 +906,7 @@ def add_parser(*args, **kwargs):
help="Delete build directories for the selected target"
)

add_parser("build-testbed", help="Build the testbed app")
build_testbed = add_parser("build-testbed", help="Build the testbed app")
test = add_parser("test", help="Run the testbed app")
package = add_parser("package", help="Make a release package")
ci = add_parser("ci", help="Run build, package and test")
Expand All @@ -912,6 +922,7 @@ def add_parser(*args, **kwargs):
make_host,
build,
package,
build_testbed,
Comment thread
mhsmith marked this conversation as resolved.
Outdated
test,
ci,
]:
Expand Down
5 changes: 4 additions & 1 deletion Android/testbed/app/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,10 @@ plugins {

val ANDROID_DIR = file("../..")
val PYTHON_DIR = ANDROID_DIR.parentFile!!
val PYTHON_CROSS_DIR = file("$PYTHON_DIR/cross-build")
val CROSS_BUILD_DIR = System.getenv("CROSS_BUILD_DIR") ?: "cross-build"
val PYTHON_CROSS_DIR = file(
if ((File(CROSS_BUILD_DIR)).isAbsolute) CROSS_BUILD_DIR else "$PYTHON_DIR/$CROSS_BUILD_DIR"
Comment thread
mhsmith marked this conversation as resolved.
Outdated
)
val inSourceTree = (
ANDROID_DIR.name == "Android" && file("$PYTHON_DIR/pyconfig.h.in").exists()
)
Expand Down
Loading