aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorColin Cross <ccross@android.com>2016-07-11 16:11:59 -0700
committerColin Cross <ccross@android.com>2016-07-11 16:14:13 -0700
commitb5bc4b412a65b88ecd92266173685277ec89ed9e (patch)
tree5b231644e09be01fec5358c59448208ca60fdc3d
parent26832743495a5398865304510f4689c61694e122 (diff)
downloadbuild_soong-b5bc4b412a65b88ecd92266173685277ec89ed9e.tar.gz
build_soong-b5bc4b412a65b88ecd92266173685277ec89ed9e.tar.bz2
build_soong-b5bc4b412a65b88ecd92266173685277ec89ed9e.zip
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
-rw-r--r--cc/cc.go3
1 files changed, 2 insertions, 1 deletions
diff --git a/cc/cc.go b/cc/cc.go
index ad01b73e..64ac50f2 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()