Revert "Export non-apex variants of modules to make"

Revert submission 2462194-androidmk_for_apex_dependencies

Reason for revert: DroidMonitor-triggered revert due to breakage https://android-build.googleplex.com/builds/quarterdeck?branch=aosp-master&target=full-eng&lkgb=9723453&lkbb=9724944&fkbb=9723508, bug b/272663333.

Reverted changes: /q/submissionid:2462194-androidmk_for_apex_dependencies

Bug: 272663333
Change-Id: I847fa910a8d54de19954f56fe92a80a9bcd0ee18
This commit is contained in:
Iván Budnik
2023-03-10 16:11:26 +00:00
committed by Gerrit Code Review
parent ad222f271a
commit 295da16b95
9 changed files with 42 additions and 49 deletions

View File

@@ -609,6 +609,7 @@ type installer interface {
inSanitizerDir() bool
hostToolPath() android.OptionalPath
relativeInstallPath() string
makeUninstallable(mod *Module)
installInRoot() bool
}
@@ -3534,6 +3535,14 @@ func (c *Module) InstallInRecovery() bool {
return c.InRecovery()
}
func (c *Module) MakeUninstallable() {
if c.installer == nil {
c.ModuleBase.MakeUninstallable()
return
}
c.installer.makeUninstallable(c)
}
func (c *Module) HostToolPath() android.OptionalPath {
if c.installer == nil {
return android.OptionalPath{}