build_run_reclient_cfg_generator_after_chrome.patch 1.2 KB

123456789101112131415161718192021222324252627282930
  1. From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
  2. From: Samuel Attard <[email protected]>
  3. Date: Thu, 28 Dec 2023 17:09:08 +1300
  4. Subject: build: run reclient cfg generator after chrome
  5. We can't run our generator after chromes in gclient hooks so instead we patch
  6. their generator to run ours immediately after.
  7. This can't be upstreamed though may be replaceable later with some upstream refactors
  8. around reclient config generation.
  9. diff --git a/buildtools/reclient_cfgs/configure_reclient_cfgs.py b/buildtools/reclient_cfgs/configure_reclient_cfgs.py
  10. index f4659a4b51deb77e19a10be71c9f970278d7e3f5..bb5cc95c6c42d3fab4a971c6d7270d6ae86c02ff 100755
  11. --- a/buildtools/reclient_cfgs/configure_reclient_cfgs.py
  12. +++ b/buildtools/reclient_cfgs/configure_reclient_cfgs.py
  13. @@ -329,4 +329,13 @@ def main():
  14. if __name__ == "__main__":
  15. - sys.exit(main())
  16. + r = main()
  17. + if r != 0:
  18. + sys.exit(r)
  19. +
  20. + electron_script = os.path.join(CHROMIUM_SRC, 'third_party', 'engflow-reclient-configs', 'configure_reclient.py')
  21. + r = subprocess.call([sys.executable, electron_script, '--src_dir=src', '--force'])
  22. + if r != 0:
  23. + sys.exit(r)
  24. +
  25. + print('done')