From 1ab10a73102cdb8f948dea845ac2f1fadf98b03b Mon Sep 17 00:00:00 2001
From: Colin Cross <ccross@android.com>
Date: Tue, 4 Sep 2018 11:02:37 -0700
Subject: [PATCH] Don't clear flags in prebuiltLibraryLinker.linkerFlags

linkerFlags takes the current flags struct, it should return it
unmodified if it has nothing to do, not return an empty one.

Bug: 113837811
Test: m SANITIZE_TARGET=address
Change-Id: I35ec260f49c832a5b50ff77395eda618679e6ef9
---
 cc/prebuilt.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cc/prebuilt.go b/cc/prebuilt.go
index 3dd4d11dd..ff8a87858 100644
--- a/cc/prebuilt.go
+++ b/cc/prebuilt.go
@@ -62,7 +62,7 @@ func (p *prebuiltLibraryLinker) linkerDeps(ctx DepsContext, deps Deps) Deps {
 }
 
 func (p *prebuiltLibraryLinker) linkerFlags(ctx ModuleContext, flags Flags) Flags {
-	return Flags{}
+	return flags
 }
 
 func (p *prebuiltLibraryLinker) linkerProps() []interface{} {