diff options
author | Victor Chang <vichang@google.com> | 2023-12-18 12:14:37 +0000 |
---|---|---|
committer | Victor Chang <vichang@google.com> | 2023-12-18 12:34:43 +0000 |
commit | a4fdac6f575cdea7f69a156b1df18d695fefccc4 (patch) | |
tree | c9f91432006c2046fa6f41967b1319c1fd5678c3 | |
parent | fc5ed12abd5ebd2312fd7a82d534c06be37274cd (diff) | |
download | manifest-a4fdac6f575cdea7f69a156b1df18d695fefccc4.tar.gz |
Add dependency of aconfig to master-art
The dependencies were dumped from aosp/main with the following bazel-query
bazel query --config=queryview 'deps(//build/make/tools/aconfig:aconfig--linux_glibc_x86_64)'
bazel query --config=queryview 'deps(set(//external/rust/crates/protobuf-parse:libprotobuf_parse--linux_glibc_x86_dylib //external/rust/crates/regex:libregex--linux_glibc_x86_dylib))'
aconfig binary is required to build a Soong java_aconfig_library module.
I did successfully use the prebuilt aconfig in master-art, but the
verison is not latest, and we need the latest aconfig to unblock
go/mainline-on-main. Also, the build logic of using aconfig optionally is a
bit complicated as it involves other branches, and I haven't
figured out the best way to do so.
Bug: 316554963
Test: art/tools/buildbot-build.sh --dist succesfully with https://r.android.com/c/2880086/1
Change-Id: I0c4fa4d8baaece2cc5b9f10f6af926b619b0dac4
-rw-r--r-- | default.xml | 49 |
1 files changed, 49 insertions, 0 deletions
diff --git a/default.xml b/default.xml index bfa3e5b96..89bd63744 100644 --- a/default.xml +++ b/default.xml @@ -296,6 +296,55 @@ <!-- Optimization profiles --> <project path="toolchain/pgo-profiles" name="toolchain/pgo-profiles" groups="pdk" /> + <!-- For aconfig binary. Consider using prebuilt aconfig when the binary is stablized. --> + <project path="external/rust/crates/anyhow" name="platform/external/rust/crates/anyhow" groups="pdk" /> + <project path="external/rust/crates/ahash" name="platform/external/rust/crates/ahash" groups="pdk" /> + <project path="external/rust/crates/aho-corasick" name="platform/external/rust/crates/aho-corasick" groups="pdk" /> + <project path="external/rust/crates/bitflags" name="platform/external/rust/crates/bitflags" groups="pdk" /> + <project path="external/rust/crates/byteorder" name="platform/external/rust/crates/byteorder" groups="pdk" /> + <project path="external/rust/crates/bytes" name="platform/external/rust/crates/bytes" groups="pdk" /> + <project path="external/rust/crates/cfg-if" name="platform/external/rust/crates/cfg-if" groups="pdk" /> + <project path="external/rust/crates/clap_derive" name="platform/external/rust/crates/clap_derive" groups="pdk" /> + <project path="external/rust/crates/clap_lex" name="platform/external/rust/crates/clap_lex" groups="pdk" /> + <project path="external/rust/crates/clap" name="platform/external/rust/crates/clap" groups="pdk" /> + <project path="external/rust/crates/either" name="platform/external/rust/crates/either" groups="pdk" /> + <project path="external/rust/crates/fastrand" name="platform/external/rust/crates/fastrand" groups="pdk" /> + <project path="external/rust/crates/getrandom" name="platform/external/rust/crates/getrandom" groups="pdk" /> + <project path="external/rust/crates/hashbrown" name="platform/external/rust/crates/hashbrown" groups="pdk" /> + <project path="external/rust/crates/heck" name="platform/external/rust/crates/heck" groups="pdk" /> + <project path="external/rust/crates/indexmap" name="platform/external/rust/crates/indexmap" groups="pdk" /> + <project path="external/rust/crates/itertools" name="platform/external/rust/crates/itertools" groups="pdk" /> + <project path="external/rust/crates/itoa" name="platform/external/rust/crates/itoa" groups="pdk" /> + <project path="external/rust/crates/libc" name="platform/external/rust/crates/libc" groups="pdk" /> + <project path="external/rust/crates/log" name="platform/external/rust/crates/log" groups="pdk" /> + <project path="external/rust/crates/memchr" name="platform/external/rust/crates/memchr" groups="pdk" /> + <project path="external/rust/crates/once_cell" name="platform/external/rust/crates/once_cell" groups="pdk" /> + <project path="external/rust/crates/os_str_bytes" name="platform/external/rust/crates/os_str_bytes" groups="pdk" /> + <project path="external/rust/crates/paste" name="platform/external/rust/crates/paste" groups="pdk" /> + <project path="external/rust/crates/proc-macro2" name="platform/external/rust/crates/proc-macro2" groups="pdk" /> + <project path="external/rust/crates/protobuf-codegen" name="platform/external/rust/crates/protobuf-codegen" groups="pdk" /> + <project path="external/rust/crates/protobuf" name="platform/external/rust/crates/protobuf" groups="pdk" /> + <project path="external/rust/crates/protobuf-parse" name="platform/external/rust/crates/protobuf-parse" groups="pdk" /> + <project path="external/rust/crates/protobuf-support" name="platform/external/rust/crates/protobuf-support" groups="pdk" /> + <project path="external/rust/crates/quote" name="platform/external/rust/crates/quote" groups="pdk" /> + <project path="external/rust/crates/regex" name="platform/external/rust/crates/regex" groups="pdk" /> + <project path="external/rust/crates/regex-syntax" name="platform/external/rust/crates/regex-syntax" groups="pdk" /> + <project path="external/rust/crates/remove_dir_all" name="platform/external/rust/crates/remove_dir_all" groups="pdk" /> + <project path="external/rust/crates/ryu" name="platform/external/rust/crates/ryu" groups="pdk" /> + <project path="external/rust/crates/serde_derive" name="platform/external/rust/crates/serde_derive" groups="pdk" /> + <project path="external/rust/crates/serde_json" name="platform/external/rust/crates/serde_json" groups="pdk" /> + <project path="external/rust/crates/serde" name="platform/external/rust/crates/serde" groups="pdk" /> + <project path="external/rust/crates/syn" name="platform/external/rust/crates/syn" groups="pdk" /> + <project path="external/rust/crates/tempfile" name="platform/external/rust/crates/tempfile" groups="pdk" /> + <project path="external/rust/crates/thiserror-impl" name="platform/external/rust/crates/thiserror-impl" groups="pdk" /> + <project path="external/rust/crates/thiserror" name="platform/external/rust/crates/thiserror" groups="pdk" /> + <project path="external/rust/crates/tinytemplate" name="platform/external/rust/crates/tinytemplate" groups="pdk" /> + <project path="external/rust/crates/unicode-ident" name="platform/external/rust/crates/unicode-ident" groups="pdk" /> + <project path="external/rust/crates/unicode-segmentation" name="platform/external/rust/crates/unicode-segmentation" groups="pdk" /> + <project path="external/rust/crates/which" name="platform/external/rust/crates/which" groups="pdk" /> + <project path="external/rust/crates/zerocopy-derive" name="platform/external/rust/crates/zerocopy-derive" groups="pdk" /> + <project path="external/rust/crates/zerocopy" name="platform/external/rust/crates/zerocopy" groups="pdk" /> + <!-- ART Module build dependencies in prebuilts. None of these prebuilts should be included in the ART apex. |