tree 4dec0542054838249c61b30645b08a3b48f625bf
parent b020d570038c184a5f1c8523ccf113d742c0fae4
parent 803e161ac92aaea5edc2d66d9ed7b888267e130c
author Treehugger Robot <treehugger-gerrit@google.com> 1566519308 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1566519308 +0000

Merge changes I75b4a761,I779f28c6,If1422372,I26307dd1

* changes:
  Introduce inject_bssl_hash library property.
  BoringSSL FIPS build - introduce extraLibFlags and use for STL libs.
  Allow linker scripts when building objects.
  Allow .o files as srcs.