From 632408fb5dc2ae49f4dbbbb049c210efadc7a898 Mon Sep 17 00:00:00 2001 From: Cole Faust Date: Fri, 10 Nov 2023 15:05:28 -0800 Subject: Sandbox bluetooth genrules These genrules work with sandboxing already, they just had non-determinism that lead genrule_sandboxing.py to think that they didn't. Non-determinism sources include: - HeadlessBuildTimestamp literally just generates a header file with a timestamp, not much we can do here other than re-architect their code. - Pdlc has a non-determinism issue I sent out a cl to fix: https://github.com/google/pdl/pull/85 - Python tools write the command they were ran with to generated files, and non-embedded-launcher python scripts have non-deterministic paths. Switched to embedded_launcher: true: aosp/2825231 - In addition, the path to the genrule sandbox is not non-deterministic, but it is a hash of the inputs to the sandbox. When running genrule_sandbox.py, it compares a "partial" sandbox (which only sandboxes tools) to a "full" sandbox, and these two runs have different sandbox hashes. Bug: 307824623 Test: Presubmits Change-Id: Ib966262dc1aac99a0798f26d8a03966cc97fe1bf --- genrule/allowlists.go | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/genrule/allowlists.go b/genrule/allowlists.go index 783930809..42e597cfb 100644 --- a/genrule/allowlists.go +++ b/genrule/allowlists.go @@ -56,7 +56,6 @@ var ( "CtsApkVerityTestDebugFiles", "FrontendStub_cc", "FrontendStub_h", - "HeadlessBuildTimestamp", "ImageProcessing-rscript", "ImageProcessing2-rscript", "ImageProcessingJB-rscript", @@ -89,7 +88,6 @@ var ( "atest_integration_fake_src", "authfs_test_apk_assets", "awkgram.tab.h", - "bluetooth_core_rust_packets", "c2hal_test_genc++", "c2hal_test_genc++_headers", "camera-its", @@ -110,8 +108,6 @@ var ( "fdt_test_tree_multiple_memory_ranges_dtb", "fdt_test_tree_one_memory_range_dtb", "futility_cmds", - "gd_hci_packets_python3_gen", - "gd_smp_packets_python3_gen", "gen_corrupt_rebootless_apex", "gen_corrupt_superblock_apex", "gen_key_mismatch_capex", @@ -123,7 +119,6 @@ var ( "gles2_extensions_functions_hdr", "gles31_only_functions_hdr", "gles3_only_functions_hdr", - "hci_packets_python3_gen", "lib-test-profile-text-protos", "libbssl_sys_src_nostd", "libc_musl_sysroot_bits", @@ -133,8 +128,6 @@ var ( "libmojo_jni_headers", "libxml2_schema_fuzz_corpus", "libxml2_xml_fuzz_corpus", - "link_layer_packets_python3_gen", - "llcp_packets_python3_gen", "measure_io_as_jar", "openwrt_rootfs_combined_aarch64", "openwrt_rootfs_combined_x86_64", @@ -155,9 +148,6 @@ var ( "pvmfw_fdt_template_rs", "r8retrace-dexdump-sample-app", "r8retrace-run-retrace", - "rootcanal_bredr_bb_packets_cxx_gen", - "rootcanal_hci_packets_cxx_gen", - "rootcanal_link_layer_packets_cxx_gen", "sample-profile-text-protos", "seller-frontend-service-stub-lite", "services.core.protologsrc", -- cgit v1.2.3-59-g8ed1b