commit 4cbd49810c41722556ad5154ea920f3e4da72c01
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Wed Oct 04 00:22:57 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Oct 04 00:22:57 2023 +0000
tree 4b5adb1186f6942a473884a53ff8fdb11198aa3b
parent 2d1bf53169d2c846be4b189e16c82f0ed4e2de87
parent d61dcef2ffcc547c1578e2a07de68df87a8b3d2a

Merge changes Ib2667798,I9a1fa32b into main

* changes:
  Symlink to rules_testing in soong integration test.
  Remove AconfigJavaHostTest from the allowlist.

android/allowlists/allowlists.go

diff --git a/android/allowlists/allowlists.go b/android/allowlists/allowlists.go
index 6014deb..b7faf34 100644
--- a/android/allowlists/allowlists.go
+++ b/android/allowlists/allowlists.go
@@ -524,7 +524,6 @@
 	}
 
 	Bp2buildModuleAlwaysConvertList = []string{
-		"AconfigJavaHostTest",
 		// aconfig
 		"libonce_cell",
 		"libanyhow",

tests/lib.sh

diff --git a/tests/lib.sh b/tests/lib.sh
index 0766d85..dbb10b7 100644
--- a/tests/lib.sh
+++ b/tests/lib.sh
@@ -158,6 +158,7 @@
   symlink_directory external/bazelbuild-rules_python
   symlink_directory external/bazelbuild-rules_java
   symlink_directory external/bazelbuild-rules_rust
+  symlink_directory external/bazelbuild-rules_testing
   symlink_directory external/rust/crates/tinyjson
 
   symlink_file WORKSPACE