diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-06-12 18:27:47 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-06-12 18:27:47 +0000 |
| commit | bbb12d42e372c391e141058b8135e447de152ec7 (patch) | |
| tree | a3537d1c8842286450124d0752381265cd9f49a7 | |
| parent | 61d79f9d6b984aba43fb406367e01d90227b7c05 (diff) | |
| parent | 5c60119f0d17194bf240a72c9f35975449ddb942 (diff) | |
| download | cpython3-bbb12d42e372c391e141058b8135e447de152ec7.tar.gz | |
Snap for 10306048 from 5c60119f0d17194bf240a72c9f35975449ddb942 to simpleperf-release
Change-Id: I774d0ec8377d5d47f694c8cf4dbcc1182b536815
| -rw-r--r-- | Android.bp | 3 | ||||
| -rw-r--r-- | kokoro/kokoro_build.cmd | 6 |
2 files changed, 9 insertions, 0 deletions
diff --git a/Android.bp b/Android.bp index 5154b97a74..47cdaa64bb 100644 --- a/Android.bp +++ b/Android.bp @@ -131,6 +131,9 @@ cpython3_cc_defaults { android_arm64: { cflags: ["-DSOABI=\"cpython-310android-arm64-android-bionic\""], }, + android_riscv64: { + cflags: ["-DSOABI=\"cpython-310android-riscv64-android-bionic\""], + }, android_x86: { cflags: ["-DSOABI=\"cpython-310android-x86-android-bionic\""], }, diff --git a/kokoro/kokoro_build.cmd b/kokoro/kokoro_build.cmd index 7b7bb7ba25..095f593f12 100644 --- a/kokoro/kokoro_build.cmd +++ b/kokoro/kokoro_build.cmd @@ -20,6 +20,12 @@ set PYTHON_SRC=%~dp0.. :: (It could leave Cygwin at the very end, but that's less of a problem.) set PATH=%PATH:C:\cygwin64\bin;=% +:: The Kokoro image has two copies of MSBuild installed. Prefer the one in +:: C:\VS\MSBuild over the one in +:: "C:\Program Files (x86)\Microsoft Visual Studio\2022\BuildTools\MSBuild" +:: See https://yaqs.corp.google.com/eng/q/8657098259782696960#a1. +if exist C:\VS\MSBuild\Current\Bin\amd64\MSBuild.exe (set "PATH=C:\VS\MSBuild\Current\Bin\amd64;%PATH%") + :: When we're actually running in the Kokoro environment, the git checkouts are :: not owned by the current user, so when the Python build scripts query info :: about them, git fails. Fix this by disabling git's safe directory checking. |