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.
This commit is contained in:
Treehugger Robot
2019-08-23 00:15:08 +00:00
committed by Gerrit Code Review
12 changed files with 100 additions and 30 deletions

View File

@@ -272,7 +272,9 @@ func CreateTestContext(bp string, fs map[string][]byte,
mockFS := map[string][]byte{
"Android.bp": []byte(bp),
"foo.c": nil,
"foo.lds": nil,
"bar.c": nil,
"baz.o": nil,
"a.proto": nil,
"b.aidl": nil,
"sub/c.aidl": nil,