Skip to content

Commit 68ba1d7

Browse files
committed
Allow for cross-build to be absolute.
1 parent db873ac commit 68ba1d7

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

Android/android.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -906,7 +906,7 @@ def add_parser(*args, **kwargs):
906906
help="Delete build directories for the selected target"
907907
)
908908

909-
add_parser("build-testbed", help="Build the testbed app")
909+
build_testbed = add_parser("build-testbed", help="Build the testbed app")
910910
test = add_parser("test", help="Run the testbed app")
911911
package = add_parser("package", help="Make a release package")
912912
ci = add_parser("ci", help="Run build, package and test")
@@ -922,6 +922,7 @@ def add_parser(*args, **kwargs):
922922
make_host,
923923
build,
924924
package,
925+
build_testbed,
925926
test,
926927
ci,
927928
]:

Android/testbed/app/build.gradle.kts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,9 @@ plugins {
88

99
val ANDROID_DIR = file("../..")
1010
val PYTHON_DIR = ANDROID_DIR.parentFile!!
11+
val CROSS_BUILD_DIR = System.getenv("CROSS_BUILD_DIR") ?: "cross-build"
1112
val PYTHON_CROSS_DIR = file(
12-
"$PYTHON_DIR/" + (System.getenv("CROSS_BUILD_DIR") ?: "cross-build")
13+
if ((File(CROSS_BUILD_DIR)).isAbsolute) CROSS_BUILD_DIR else "$PYTHON_DIR/$CROSS_BUILD_DIR"
1314
)
1415
val inSourceTree = (
1516
ANDROID_DIR.name == "Android" && file("$PYTHON_DIR/pyconfig.h.in").exists()

0 commit comments

Comments
 (0)