Export non-apex variants of modules to make
Currently, non-apex variants of modules that are in apexes are not exported to make unless they're apex_available to the platform. This means that you can't `m` those modules directly. However, there is a workaround in the apex androidmk implementation that emits make rules for the removed modules, but just redirects them to build the apex itself. We want to remove that, but one of the problems with doing so is that you can no longer `m` many modules afterwards. To fix that, unhide the apex's dependencies from make. To ensure they're not installed, call SkipInstall() on them, and update SkipInstall() to be more strict by setting `LOCAL_UNINSTALLABLE_MODULE := true`. Bug: 254205429 Test: Presubmits Change-Id: Ib094feb2c437ad50d8319c58caa997759e7ce32f
This commit is contained in:
@@ -505,8 +505,8 @@ type Module interface {
|
||||
PartitionTag(DeviceConfig) string
|
||||
HideFromMake()
|
||||
IsHideFromMake() bool
|
||||
SkipInstall()
|
||||
IsSkipInstall() bool
|
||||
MakeUninstallable()
|
||||
ReplacedByPrebuilt()
|
||||
IsReplacedByPrebuilt() bool
|
||||
ExportedToMake() bool
|
||||
@@ -1964,15 +1964,6 @@ func (m *ModuleBase) IsSkipInstall() bool {
|
||||
return m.commonProperties.SkipInstall
|
||||
}
|
||||
|
||||
// Similar to HideFromMake, but if the AndroidMk entry would set
|
||||
// LOCAL_UNINSTALLABLE_MODULE then this variant may still output that entry
|
||||
// rather than leaving it out altogether. That happens in cases where it would
|
||||
// have other side effects, in particular when it adds a NOTICE file target,
|
||||
// which other install targets might depend on.
|
||||
func (m *ModuleBase) MakeUninstallable() {
|
||||
m.HideFromMake()
|
||||
}
|
||||
|
||||
func (m *ModuleBase) ReplacedByPrebuilt() {
|
||||
m.commonProperties.ReplacedByPrebuilt = true
|
||||
m.HideFromMake()
|
||||
|
Reference in New Issue
Block a user