StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Refactor 'in_make' to mean Kati is not skipped."

Browse Source
This commit is contained in:
Jingwen Chen
2020-11-24 02:09:21 +00:00
committed by Gerrit Code Review
parent 1b461e41bd cda22c9bb9
commit f87a720101
14 changed files with 41 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
android/module.go
View File

@@ -1440,7 +1440,7 @@ func (m *ModuleBase) generateModuleTarget(ctx ModuleContext) {
if len(deps) > 0 {
suffix := ""
if ctx.Config().EmbeddedInMake() {
if ctx.Config().KatiEnabled() {
suffix = "-soong"
}
@@ -2320,7 +2320,7 @@ func (m *moduleContext) skipInstall(fullInstallPath InstallPath) bool {
}
if m.Device() {
if m.Config().EmbeddedInMake() && !m.InstallBypassMake() {
if m.Config().KatiEnabled() && !m.InstallBypassMake() {
return true
}
@@ -2373,7 +2373,7 @@ func (m *moduleContext) installFile(installPath InstallPath, name string, srcPat
Input: srcPath,
Implicits: implicitDeps,
OrderOnly: orderOnlyDeps,
Default: !m.Config().EmbeddedInMake(),
Default: !m.Config().KatiEnabled(),
})
m.installFiles = append(m.installFiles, fullInstallPath)
@@ -2405,7 +2405,7 @@ func (m *moduleContext) InstallSymlink(installPath InstallPath, name string, src
Description: "install symlink " + fullInstallPath.Base(),
Output: fullInstallPath,
Input: srcPath,
Default: !m.Config().EmbeddedInMake(),
Default: !m.Config().KatiEnabled(),
Args: map[string]string{
"fromPath": relPath,
},
@@ -2436,7 +2436,7 @@ func (m *moduleContext) InstallAbsoluteSymlink(installPath InstallPath, name str
Rule: Symlink,
Description: "install symlink " + fullInstallPath.Base() + " -> " + absPath,
Output: fullInstallPath,
Default: !m.Config().EmbeddedInMake(),
Default: !m.Config().KatiEnabled(),
Args: map[string]string{
"fromPath": absPath,
},
@@ -2674,7 +2674,7 @@ func (c *buildTargetSingleton) GenerateBuildActions(ctx SingletonContext) {
})
suffix := ""
if ctx.Config().EmbeddedInMake() {
if ctx.Config().KatiEnabled() {
suffix = "-soong"
}
@@ -2682,7 +2682,7 @@ func (c *buildTargetSingleton) GenerateBuildActions(ctx SingletonContext) {
ctx.Phony("checkbuild"+suffix, checkbuildDeps...)
// Make will generate the MODULES-IN-* targets
if ctx.Config().EmbeddedInMake() {
if ctx.Config().KatiEnabled() {
return
}