commit 99f2fc27e6583907ad8592f30d27af506e7460f1
author Pete Bentley <prb@google.com> Fri Aug 02 14:02:20 2019 +0100
committer Colin Cross <ccross@android.com> Thu Aug 22 13:21:37 2019 -0700
tree 64269704e67f8c59559ea79735f039ae4f8601c0
parent 74c9bbacb6a616cf201546cdd1fb1d0baca58de2

BoringSSL FIPS build - introduce extraLibFlags and use for STL libs.

Rationale: On non-bionic, stl.go currently adds system libraries to
ldFlags, this causes problems for partialLd rules.  However adding the
same libraries to libFlags breaks some existing modules due to symbol
conflicts as the system libraries are linked before some module code.

Introduced a general mechanism for adding libraries to be linked
last rather than making this STL-specific.

Bug: 134581881
Bug: 137267623
Test: TH
Change-Id: I779f28c6586b3fea85cc6299b686e4fde95262d3

cc/util.go

diff --git a/cc/util.go b/cc/util.go
index 0d1b2f0..fb6338a 100644
--- a/cc/util.go
+++ b/cc/util.go
@@ -67,6 +67,7 @@
 		rsFlags:         strings.Join(in.rsFlags, " "),
 		ldFlags:         strings.Join(in.LdFlags, " "),
 		libFlags:        strings.Join(in.libFlags, " "),
+		extraLibFlags:   strings.Join(in.extraLibFlags, " "),
 		tidyFlags:       strings.Join(in.TidyFlags, " "),
 		sAbiFlags:       strings.Join(in.SAbiFlags, " "),
 		yasmFlags:       strings.Join(in.YasmFlags, " "),