From 12fc4977bf8b16dca4b9197225ce303cd092addc Mon Sep 17 00:00:00 2001
From: Colin Cross <ccross@android.com>
Date: Mon, 11 Jan 2016 12:49:11 -0800
Subject: [PATCH 1/2] Fix checkbuild with symlinks

Soong delegates installation to make when embedded in make, so it can't
create any dependencies on installed files.  Only create the symlink
rules if not embedded in make.

Change-Id: I26d2857e6d544b963a0c52145a8666ba30864838
---
 android/module.go | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/android/module.go b/android/module.go
index ef20f8d8f..216aefe9d 100644
--- a/android/module.go
+++ b/android/module.go
@@ -567,18 +567,20 @@ func (a *androidModuleContext) InstallFile(installPath OutputPath, srcPath Path,
 func (a *androidModuleContext) InstallSymlink(installPath OutputPath, name string, srcPath OutputPath) OutputPath {
 	fullInstallPath := installPath.Join(a, name)
 
-	a.ModuleBuild(pctx, ModuleBuildParams{
-		Rule:      Symlink,
-		Output:    fullInstallPath,
-		OrderOnly: Paths{srcPath},
-		Default:   !a.AConfig().EmbeddedInMake(),
-		Args: map[string]string{
-			"fromPath": srcPath.String(),
-		},
-	})
+	if a.Host() || !a.AConfig().SkipDeviceInstall() {
+		a.ModuleBuild(pctx, ModuleBuildParams{
+			Rule:      Symlink,
+			Output:    fullInstallPath,
+			OrderOnly: Paths{srcPath},
+			Default:   !a.AConfig().EmbeddedInMake(),
+			Args: map[string]string{
+				"fromPath": srcPath.String(),
+			},
+		})
 
-	a.installFiles = append(a.installFiles, fullInstallPath)
-	a.checkbuildFiles = append(a.checkbuildFiles, srcPath)
+		a.installFiles = append(a.installFiles, fullInstallPath)
+		a.checkbuildFiles = append(a.checkbuildFiles, srcPath)
+	}
 	return fullInstallPath
 }
 

From 3d92b27717f7c995ac1f63ec6ffba7d03b8bd46b Mon Sep 17 00:00:00 2001
From: Colin Cross <ccross@android.com>
Date: Thu, 14 Jul 2016 15:59:32 -0700
Subject: [PATCH 2/2] Add libc and libm to modules that use libc++_static

Matches makefile change Ib21364e6f43689cf59da31d6f561919731ef8272

Change-Id: I6b4f3fcc65e5cac190bf9da315bd9d81e4c7cd3d
---
 cc/stl.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cc/stl.go b/cc/stl.go
index 548a62afa..a7e362c8a 100644
--- a/cc/stl.go
+++ b/cc/stl.go
@@ -102,7 +102,7 @@ func (stl *stl) deps(ctx BaseModuleContext, deps Deps) Deps {
 				deps.StaticLibs = append(deps.StaticLibs, "libunwind_llvm")
 			}
 			if ctx.staticBinary() {
-				deps.StaticLibs = append(deps.StaticLibs, "libdl")
+				deps.StaticLibs = append(deps.StaticLibs, "libm", "libc", "libdl")
 			} else {
 				deps.SharedLibs = append(deps.SharedLibs, "libdl")
 			}