Merge "Make all soong modules optional when building in make"
This commit is contained in:
@@ -313,6 +313,7 @@ func (a *AndroidModuleBase) generateModuleTarget(ctx blueprint.ModuleContext) {
|
|||||||
Rule: blueprint.Phony,
|
Rule: blueprint.Phony,
|
||||||
Outputs: []string{name},
|
Outputs: []string{name},
|
||||||
Implicits: allInstalledFiles.Strings(),
|
Implicits: allInstalledFiles.Strings(),
|
||||||
|
Optional: ctx.Config().(Config).EmbeddedInMake(),
|
||||||
})
|
})
|
||||||
deps = append(deps, name)
|
deps = append(deps, name)
|
||||||
a.installTarget = name
|
a.installTarget = name
|
||||||
@@ -471,7 +472,7 @@ func (a *androidModuleContext) InstallFileName(installPath, name string, srcPath
|
|||||||
Output: fullInstallPath,
|
Output: fullInstallPath,
|
||||||
Input: srcPath,
|
Input: srcPath,
|
||||||
OrderOnly: Paths(deps),
|
OrderOnly: Paths(deps),
|
||||||
Default: true,
|
Default: !a.AConfig().EmbeddedInMake(),
|
||||||
})
|
})
|
||||||
|
|
||||||
a.installFiles = append(a.installFiles, fullInstallPath)
|
a.installFiles = append(a.installFiles, fullInstallPath)
|
||||||
|
Reference in New Issue
Block a user