Home Explore 引导页 在线工具 Blog
Register Sign In
Pchen0
/
electron
1
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Tree: 6be1151ffc
Branches Tags
electron
/
patches
/
chromium
/
build_run_reclient_cfg_generator_after_chrome.patch

build_run_reclient_cfg_generator_after_chrome.patch 2.3 KB
History Raw

1234567891011121314151617181920212223242526272829303132333435363738394041424344454647484950515253545556 
  1. From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
    2. 

  2. From: Samuel Attard <[email protected]>
    3. 

  3. Date: Thu, 28 Dec 2023 17:09:08 +1300
    4. 

  4. Subject: build: run reclient cfg generator after chrome
    5. 

  5. 

  6. We can't run our generator after chromes in gclient hooks so instead we patch
    7. 

  7. their generator to run ours immediately after.
    8. 

  8. 

  9. This can't be upstreamed though may be replaceable later with some upstream refactors
    10. 

  10. around reclient config generation.
    11. 

  11. 

  12. diff --git a/buildtools/reclient_cfgs/.gitignore b/buildtools/reclient_cfgs/.gitignore
    13. 

  13. index 17103061c4752e6fcac07413dbf574e0c6fd6d39..848be71fa6dc81a64b7274b31d461f9dcc4697fc 100644
    14. 

  14. --- a/buildtools/reclient_cfgs/.gitignore
    15. 

  15. +++ b/buildtools/reclient_cfgs/.gitignore
    16. 

  16. @@ -1,4 +1,5 @@
    17. 

  17.  /chromium-browser-clang/
    18. 

  18.  /python/
    19. 

  19. +/nacl/
    20. 

  20.  /win-cross/
    21. 

  21.  reproxy.cfg
    22. 

  22. diff --git a/buildtools/reclient_cfgs/configure_reclient_cfgs.py b/buildtools/reclient_cfgs/configure_reclient_cfgs.py
    23. 

  23. index 128bda296c91eac5f0c2fcfeed0c553deb5514dd..f1e33d36810dba80a42608655beb27c6e197a888 100755
    24. 

  24. --- a/buildtools/reclient_cfgs/configure_reclient_cfgs.py
    25. 

  25. +++ b/buildtools/reclient_cfgs/configure_reclient_cfgs.py
    26. 

  26. @@ -344,4 +344,13 @@ def main():
    27. 

  27.  
    28. 

  28.  
    29. 

  29.  if __name__ == "__main__":
    30. 

  30. -    sys.exit(main())
    31. 

  31. +    r = main()
    32. 

  32. +    if r != 0:
    33. 

  33. +        sys.exit(r)
    34. 

  34. +
    35. 

  35. +    electron_script = os.path.join(CHROMIUM_SRC, 'third_party', 'engflow-reclient-configs', 'configure_reclient.py')
    36. 

  36. +    r = subprocess.call([sys.executable, electron_script, '--src_dir=src', '--force'])
    37. 

  37. +    if r != 0:
    38. 

  38. +        sys.exit(r)
    39. 

  39. +
    40. 

  40. +    print('done')
    41. 

  41. diff --git a/buildtools/reclient_cfgs/nacl/rewrapper_linux.cfg b/buildtools/reclient_cfgs/nacl/rewrapper_linux.cfg
    42. 

  42. deleted file mode 100644
    43. 

  43. index 0a0771da2d7ab44f13037c95f8b948cf9b8c663f..0000000000000000000000000000000000000000
    44. 

  44. --- a/buildtools/reclient_cfgs/nacl/rewrapper_linux.cfg
    45. 

  45. +++ /dev/null
    46. 

  46. @@ -1,10 +0,0 @@
    47. 

  47. -# use the same platform container image as build/config/siso/main.star
    48. 

  48. -platform=container-image=docker://gcr.io/chops-public-images-prod/rbe/siso-chromium/linux@sha256:ef35d347f4a4a2d32b76fd908e66e96f59bf8ba7379fd5626548244c45343b2b,label:action_default=1
    49. 

  49. -server_address=unix:///tmp/reproxy.sock
    50. 

  50. -labels=type=compile,compiler=nacl,lang=cpp
    51. 

  51. -exec_strategy=racing
    52. 

  52. -inputs=native_client/toolchain/linux_x86/saigo_newlib/lib
    53. 

  53. -dial_timeout=10m
    54. 

  54. -canonicalize_working_dir=true
    55. 

  55. -exec_timeout=2m
    56. 

  56. -reclient_timeout=4m
    57.