tree 9d8f952deef20b0debad7e375a061c80ef261c01
parent 010ac99ed02882d391c9d7120f6076489f616530
author Fabian Meumertzheim <fabian@meumertzhe.im> 1710445229 +0100
committer GitHub <noreply@github.com> 1710445229 +0000
gpgsig -----BEGIN PGP SIGNATURE-----
 
 wsFcBAABCAAQBQJl81K8CRC1aQ7uu5UhlAAAkY8QAADvhfCoE4cDRAISoxINmpT/
 B/SM2pKkxoP2FcpPVjgHWZ+mHBqKup8E9T3+LBiY+a9WgqmvM3VwMWeFWfokXB1v
 JQKg14QoRh+0cbEjskBsdc2v+jQ1off9uA4vUWMZZVtF20lS6XJd5tMLFWTj+ro6
 d5QEArTKLFhu9twjpD0ZQivdbyEezDyWuR0bs1z0qiolgrs9zVRjYLTMy29agr7A
 INGu/UH0/SqyVnoLgav3UHGllKEsDBw5/Yg+1t+XGY5wt1fiF+YkgQRAKtPiydgG
 IXADgEE+/OzgY7zg2lJzWT1LVKmxiA30irVr00AAtmek/UzmhCnr0ly5ingqsfa0
 qllUTjCZA9TK+fC73PCSvuz8i2MEn32Z+OgaaIBYrjFTxQ7oBUH5lTn5kuvkDlao
 2O7MMQPXaV/M+lDlz1at46x2N24As/vpP9L58raWtudkVavvhS6R1udpa8EbQWH5
 hn0wyDrxMtWHeBsxWNUWw6NQBANYVxu3pP45fO0Nul4cntn79kYwirhBG44PXE9g
 sXufJF6y6Uqro8KLLkrk/u3xhdb45DePx7XWSa4ELpmKGg1MiD9uUlLyU+naFO45
 6u02acKN4JUb1/HVODTzJ0R1Eewoo77JSyRLgkTjh5Ww1gjvPjc+A9xyF/Ag8KwK
 JC0UNAlI2W2OtTyBLYw4
 =Z9rP
 -----END PGP SIGNATURE-----
 

Cherry-pick Java execution info improvements (#21703)

* [Avoid making a copy in mergeMaps if one of the input maps is
empty.](https://github.com/bazelbuild/bazel/commit/3e8ee270bfc2fb6e51ea8f757d3a77afdb6044a9)

* [Add the path for in-memory jdeps files to execution info on demand
instead of storing it in `JavaCompileAction` and
`JavaHeaderCompileAction`.](https://github.com/bazelbuild/bazel/commit/c830f21a627b973890fcf2b53b2a4a7ee40f33bf)

Fixes https://github.com/bazelbuild/bazel/issues/21661

---------

Co-authored-by: Googler <jhorvitz@google.com>