Merge changes Ib2667798,I9a1fa32b into main am: 4cbd49810c am: 31f5c0d738 am: 632e6360d1

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2771005

Change-Id: I7f65e5206789ef40fd749229301fcf4effd00f9e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot 2023-10-04 01:27:42 +00:00 committed by Automerger Merge Worker
commit b8246fbafe
2 changed files with 1 additions and 1 deletions

View file

@ -524,7 +524,6 @@ var (
} }
Bp2buildModuleAlwaysConvertList = []string{ Bp2buildModuleAlwaysConvertList = []string{
"AconfigJavaHostTest",
// aconfig // aconfig
"libonce_cell", "libonce_cell",
"libanyhow", "libanyhow",

View file

@ -158,6 +158,7 @@ function create_mock_bazel {
symlink_directory external/bazelbuild-rules_python symlink_directory external/bazelbuild-rules_python
symlink_directory external/bazelbuild-rules_java symlink_directory external/bazelbuild-rules_java
symlink_directory external/bazelbuild-rules_rust symlink_directory external/bazelbuild-rules_rust
symlink_directory external/bazelbuild-rules_testing
symlink_directory external/rust/crates/tinyjson symlink_directory external/rust/crates/tinyjson
symlink_file WORKSPACE symlink_file WORKSPACE