diff options
| -rw-r--r-- | genrule/allowlists.go | 2 | ||||
| -rwxr-xr-x | tests/genrule_sandbox_test.py | 7 |
2 files changed, 6 insertions, 3 deletions
diff --git a/genrule/allowlists.go b/genrule/allowlists.go index 1fe30dbfc..495bc1950 100644 --- a/genrule/allowlists.go +++ b/genrule/allowlists.go @@ -56,7 +56,6 @@ var ( "ImageProcessingJB-rscript", "RSTest-rscript", "BluetoothGeneratedDumpsysBinarySchema_bfbs", - "WmediumdServerProto_h", "TracingVMProtoStub_h", "FrontendStub_h", "VehicleServerProtoStub_cc", @@ -104,7 +103,6 @@ var ( "FrontendStub_cc", "OpenwrtControlServerProto_cc", "OpenwrtControlServerProto_h", - "WmediumdServerProto_cc", "c2hal_test_genc++", "c2hal_test_genc++_headers", "hidl2aidl_test_gen_aidl", diff --git a/tests/genrule_sandbox_test.py b/tests/genrule_sandbox_test.py index 697fc26e8..a9f0c9b50 100755 --- a/tests/genrule_sandbox_test.py +++ b/tests/genrule_sandbox_test.py @@ -69,7 +69,7 @@ def _find_outputs_for_modules(modules, out_dir, target_product): name = mod["Name"] if name in modules: for act in mod["Module"]["Actions"]: - if "}generate " in act["Desc"]: + if "}generate" in act["Desc"]: module_to_outs[name].update(act["Outputs"]) return module_to_outs @@ -90,6 +90,7 @@ def _store_outputs_to_tmp(output_files): def _diff_outs(file1, file2, show_diff): + output = None base_args = ["diff"] if not show_diff: base_args.append("--brief") @@ -154,6 +155,10 @@ def main(): modules = set(args.modules) module_to_outs = _find_outputs_for_modules(modules, out_dir, target_product) + if not module_to_outs: + print("No outputs found") + exit(1) + if args.output_paths_only: for m, o in module_to_outs.items(): print(f"{m} outputs: {o}") |