From b5bc4b412a65b88ecd92266173685277ec89ed9e Mon Sep 17 00:00:00 2001
From: Colin Cross <ccross@android.com>
Date: Mon, 11 Jul 2016 16:11:59 -0700
Subject: [PATCH] Add system shared library dependencies to Android.mk

We were missing dependencies from the prebuilts to the system shared
libraries, which could cause libc to not be installed if only soong
modules were built.

Change-Id: Ie5c237d7be23c6170e8b586b013f6456a8462230
---
 cc/cc.go | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/cc/cc.go b/cc/cc.go
index ad01b73ed..64ac50f2e 100644
--- a/cc/cc.go
+++ b/cc/cc.go
@@ -850,7 +850,8 @@ func (c *Module) depsMutator(actx android.BottomUpMutatorContext) {
 
 	deps := c.deps(ctx)
 
-	c.Properties.AndroidMkSharedLibs = append([]string(nil), deps.SharedLibs...)
+	c.Properties.AndroidMkSharedLibs = append(c.Properties.AndroidMkSharedLibs, deps.SharedLibs...)
+	c.Properties.AndroidMkSharedLibs = append(c.Properties.AndroidMkSharedLibs, deps.LateSharedLibs...)
 
 	if ctx.sdk() {
 		version := "." + ctx.sdkVersion()