Merge remote-tracking branch 'aosp/upstream' into master
* aosp/upstream:
Add link dependency on test package archive
Test: m checkbuild
Change-Id: I9a039504e2dbe864d6b5b832652d90e62e8ff052
diff --git a/bootstrap/bootstrap.go b/bootstrap/bootstrap.go
index be156f9..ed33f20 100644
--- a/bootstrap/bootstrap.go
+++ b/bootstrap/bootstrap.go
@@ -561,7 +561,7 @@
Optional: true,
})
- var linkDeps []string
+ linkDeps := []string{testPkgArchive}
libDirFlags := []string{"-L " + testRoot}
testDeps := []string{}
ctx.VisitDepsDepthFirstIf(isGoPackageProducer,
