summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorErwin Jansen <jansene@google.com>2023-06-06 09:40:11 -0700
committerErwin Jansen <jansene@google.com>2023-06-06 09:53:37 -0700
commit7dd69a27b15877a9648af78608b664baf8a70143 (patch)
tree1208c6baa3c552718da085188488fff48f1b7f07
parent3eedcc8f6c42a889c42152290dcbaa28eca3fc3d (diff)
downloadmanifest-7dd69a27b15877a9648af78608b664baf8a70143.tar.gz
Make MingW available on windows
The rust toolchain needs libgcc_s_seh-1.dll and libwinpthread-1.dll, which are located in the MinGW prebuilt. Bug: 284307116 Change-Id: Idf76c6a3bce9617d7866c09f6056502085194557
-rw-r--r--default.xml5
1 files changed, 4 insertions, 1 deletions
diff --git a/default.xml b/default.xml
index 310cb4ecc..58c428860 100644
--- a/default.xml
+++ b/default.xml
@@ -103,9 +103,12 @@
<!-- Test infrastructure uses these -->
<project path="prebuilts/android-emulator-build/system-images" name="platform/prebuilts/android-emulator-build/system-images" revision="master" />
- <!-- Rust compiler toolchain, note that we will use the system one on windows! -->
+ <!-- Rust compiler toolchain -->
<project path="prebuilts/rust" name="platform/prebuilts/rust" revision="master" clone-depth="1" />
+ <!-- Rust toolchain needs a set of dlls from mingw on windows -->
+ <project path="prebuilts/gcc/linux-x86/host/x86_64-w64-mingw32-4.8" name="platform/prebuilts/gcc/linux-x86/host/x86_64-w64-mingw32-4.8" revision="master" clone-depth="1" groups="notdefault,platform-windows" />
+
<!-- Rust crate dependencies, we use a mix of what chromium has to offer, vs AOSP crates. -->
<!-- In general when using rust try to use AOSP crates first by overriding them in you cargo workspace -->
<project path="external/rust/crates/aho-corasick" name="platform/external/rust/crates/aho-corasick" revision="master" />