aboutsummaryrefslogtreecommitdiffstats
path: root/common
diff options
context:
space:
mode:
authorDan Willemsen <dwillemsen@google.com>2016-03-10 18:14:25 -0800
committerDan Willemsen <dwillemsen@google.com>2016-03-11 21:52:34 +0000
commit6553f5ef573316f40aa4b00f20b676e6c4026327 (patch)
treeee2221fe90451290af6f033715746171754c6c5c /common
parenteb371e51d930b5ac79d962984d8b69e40420533d (diff)
downloadbuild_soong-6553f5ef573316f40aa4b00f20b676e6c4026327.tar.gz
build_soong-6553f5ef573316f40aa4b00f20b676e6c4026327.tar.bz2
build_soong-6553f5ef573316f40aa4b00f20b676e6c4026327.zip
Propagate missing dependencies when using whole_static_libs
Currently, whole_static_libs with missing dependencies are silently ignored. Instead, when getting the object files from the other module, add its missing dependencies to the current module. Change-Id: I12472dede2dfafdded56268bfd37f60063b637c4
Diffstat (limited to 'common')
-rw-r--r--common/module.go8
1 files changed, 8 insertions, 0 deletions
diff --git a/common/module.go b/common/module.go
index 844db7f6..8e459527 100644
--- a/common/module.go
+++ b/common/module.go
@@ -79,6 +79,8 @@ type AndroidModuleContext interface {
InstallFile(installPath OutputPath, srcPath Path, deps ...Path) Path
InstallFileName(installPath OutputPath, name string, srcPath Path, deps ...Path) Path
CheckbuildFile(srcPath Path)
+
+ AddMissingDependencies(deps []string)
}
type AndroidModule interface {
@@ -482,6 +484,12 @@ func (a *androidModuleContext) GetMissingDependencies() []string {
return a.missingDeps
}
+func (a *androidModuleContext) AddMissingDependencies(deps []string) {
+ if deps != nil {
+ a.missingDeps = append(a.missingDeps, deps...)
+ }
+}
+
func (a *androidBaseContextImpl) Arch() Arch {
return a.arch
}