commit b2ace8d72de5ca106eab5fa2dad136d482c399a9
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Sat Jul 08 00:36:53 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Sat Jul 08 00:36:53 2023 +0000
tree d5f615c4acfac979a6c34bae340ac3de9cc9d964
parent 00042a48758b103d3fb30d9b2da3e3fcb9a9d02f
parent 5368d0b44a7124072ada43ae7f21fa6ded7e0606

Merge "Implement OutputFileProducer for android_app_import and android_test_import" into main

genrule/allowlists.go

diff --git a/genrule/allowlists.go b/genrule/allowlists.go
index c767685..02b1145 100644
--- a/genrule/allowlists.go
+++ b/genrule/allowlists.go
@@ -56,7 +56,6 @@
 		"RSTest-rscript",
 		"BluetoothGeneratedDumpsysBinarySchema_bfbs",
 		"TracingVMProtoStub_h",
-		"FrontendStub_h",
 		"VehicleServerProtoStub_cc",
 		"AudioFocusControlProtoStub_cc",
 		"AudioFocusControlProtoStub_h",
@@ -98,7 +97,6 @@
 		"BlueberryFacadeGeneratedStub_cc",
 		"BlueberryFacadeGeneratedStub_h",
 		"BluetoothGeneratedDumpsysDataSchema_h",
-		"FrontendStub_cc",
 		"OpenwrtControlServerProto_cc",
 		"OpenwrtControlServerProto_h",
 		"c2hal_test_genc++",

rust/bindgen.go

diff --git a/rust/bindgen.go b/rust/bindgen.go
index 96645b0..7dc1b4b 100644
--- a/rust/bindgen.go
+++ b/rust/bindgen.go
@@ -247,7 +247,7 @@
 
 	var cmd, cmdDesc string
 	if b.Properties.Custom_bindgen != "" {
-		cmd = ctx.GetDirectDepWithTag(b.Properties.Custom_bindgen, customBindgenDepTag).(*Module).HostToolPath().String()
+		cmd = ctx.GetDirectDepWithTag(b.Properties.Custom_bindgen, customBindgenDepTag).(android.HostToolProvider).HostToolPath().String()
 		cmdDesc = b.Properties.Custom_bindgen
 	} else {
 		cmd = "$bindgenCmd"