diff options
Diffstat (limited to 'android/module.go')
| -rw-r--r-- | android/module.go | 22 |
1 files changed, 3 insertions, 19 deletions
diff --git a/android/module.go b/android/module.go index c479b596b..6de416535 100644 --- a/android/module.go +++ b/android/module.go @@ -429,7 +429,6 @@ type ModuleContext interface { InstallInRecovery() bool InstallInRoot() bool InstallInVendor() bool - InstallBypassMake() bool InstallForceOS() (*OsType, *ArchType) RequiredModuleNames() []string @@ -496,7 +495,6 @@ type Module interface { InstallInRecovery() bool InstallInRoot() bool InstallInVendor() bool - InstallBypassMake() bool InstallForceOS() (*OsType, *ArchType) HideFromMake() IsHideFromMake() bool @@ -1704,10 +1702,6 @@ func (m *ModuleBase) InstallInRoot() bool { return false } -func (m *ModuleBase) InstallBypassMake() bool { - return true -} - func (m *ModuleBase) InstallForceOS() (*OsType, *ArchType) { return nil, nil } @@ -2829,10 +2823,6 @@ func (m *moduleContext) InstallInRoot() bool { return m.module.InstallInRoot() } -func (m *moduleContext) InstallBypassMake() bool { - return m.module.InstallBypassMake() -} - func (m *moduleContext) InstallForceOS() (*OsType, *ArchType) { return m.module.InstallForceOS() } @@ -2857,12 +2847,6 @@ func (m *moduleContext) skipInstall() bool { return true } - if m.Device() { - if m.Config().KatiEnabled() && !m.InstallBypassMake() { - return true - } - } - return false } @@ -2921,7 +2905,7 @@ func (m *moduleContext) installFile(installPath InstallPath, name string, srcPat orderOnlyDeps = deps } - if m.Config().KatiEnabled() && m.InstallBypassMake() { + if m.Config().KatiEnabled() { // When creating the install rule in Soong but embedding in Make, write the rule to a // makefile instead of directly to the ninja file so that main.mk can add the // dependencies from the `required` property that are hard to resolve in Soong. @@ -2980,7 +2964,7 @@ func (m *moduleContext) InstallSymlink(installPath InstallPath, name string, src } if !m.skipInstall() { - if m.Config().KatiEnabled() && m.InstallBypassMake() { + if m.Config().KatiEnabled() { // When creating the symlink rule in Soong but embedding in Make, write the rule to a // makefile instead of directly to the ninja file so that main.mk can add the // dependencies from the `required` property that are hard to resolve in Soong. @@ -3026,7 +3010,7 @@ func (m *moduleContext) InstallAbsoluteSymlink(installPath InstallPath, name str m.module.base().hooks.runInstallHooks(m, nil, fullInstallPath, true) if !m.skipInstall() { - if m.Config().KatiEnabled() && m.InstallBypassMake() { + if m.Config().KatiEnabled() { // When creating the symlink rule in Soong but embedding in Make, write the rule to a // makefile instead of directly to the ninja file so that main.mk can add the // dependencies from the `required` property that are hard to resolve in Soong. |