diff options
Diffstat (limited to 'android/module.go')
| -rw-r--r-- | android/module.go | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/android/module.go b/android/module.go index 6b659d2cd..70c649787 100644 --- a/android/module.go +++ b/android/module.go @@ -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, }, @@ -2665,7 +2665,7 @@ func (c *buildTargetSingleton) GenerateBuildActions(ctx SingletonContext) { }) suffix := "" - if ctx.Config().EmbeddedInMake() { + if ctx.Config().KatiEnabled() { suffix = "-soong" } @@ -2673,7 +2673,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 } |