Merge "Revert "Remove flags rejected by RBE input processor"" into main
diff --git a/cc/test.go b/cc/test.go
index 28994e0..a4224c3 100644
--- a/cc/test.go
+++ b/cc/test.go
@@ -141,7 +141,6 @@
func TestFactory() android.Module {
module := NewTest(android.HostAndDeviceSupported, true)
module.bazelHandler = &ccTestBazelHandler{module: module}
- module.testModule = true
return module.Init()
}
@@ -166,7 +165,6 @@
// cc_test_host compiles a test host binary.
func TestHostFactory() android.Module {
module := NewTest(android.HostSupported, true)
- module.testModule = true
return module.Init()
}
@@ -492,6 +490,7 @@
module, binary := newBinary(hod, bazelable)
module.bazelable = bazelable
module.multilib = android.MultilibBoth
+ module.testModule = true
binary.baseInstaller = NewTestInstaller()
test := &testBinary{
diff --git a/genrule/allowlists.go b/genrule/allowlists.go
index 28d3d54..550a386 100644
--- a/genrule/allowlists.go
+++ b/genrule/allowlists.go
@@ -40,11 +40,7 @@
"aidl-golden-test-build-hook-gen",
"aidl_camera_build_version",
"android-cts-verifier",
- "angle_commit_id",
"atest_integration_fake_src",
- "awkgram.tab.h",
- "c2hal_test_genc++",
- "c2hal_test_genc++_headers",
"camera-its",
"checkIn-service-stub-lite",
"chre_atoms_log.h",
@@ -53,14 +49,10 @@
"cronet_aml_base_android_runtime_unchecked_jni_headers",
"cronet_aml_base_android_runtime_unchecked_jni_headers__testing",
"deqp_spvtools_update_build_version",
- "emp_ematch.yacc.c",
- "emp_ematch.yacc.h",
"gen_corrupt_rebootless_apex",
"gen_key_mismatch_capex",
"libbssl_sys_src_nostd",
"libc_musl_sysroot_bits",
- "libchrome-crypto-include",
- "libchrome-include",
"libcore-non-cts-tests-txt",
"pvmfw_fdt_template_rs",
"r8retrace-dexdump-sample-app",