Some clarifications in preparation to automatically order linker dependencies
Test: Browse the code and determine whether it's easier to understand
Bug: 66260943
Change-Id: I88c24a8a31ef68f428919087d206433659265684
diff --git a/android/module.go b/android/module.go
index 9d7f942..9afc8a7 100644
--- a/android/module.go
+++ b/android/module.go
@@ -61,7 +61,7 @@
Windows() bool
Debug() bool
PrimaryArch() bool
- Vendor() bool
+ InstallOnVendorPartition() bool
AConfig() Config
DeviceConfig() DeviceConfig
}
@@ -99,7 +99,11 @@
type Module interface {
blueprint.Module
+ // GenerateAndroidBuildActions is analogous to Blueprints' GenerateBuildActions,
+ // but GenerateAndroidBuildActions also has access to Android-specific information.
+ // For more information, see Module.GenerateBuildActions within Blueprint's module_ctx.go
GenerateAndroidBuildActions(ModuleContext)
+
DepsMutator(BottomUpMutatorContext)
base() *ModuleBase
@@ -690,7 +694,7 @@
return DeviceConfig{a.config.deviceConfig}
}
-func (a *androidBaseContextImpl) Vendor() bool {
+func (a *androidBaseContextImpl) InstallOnVendorPartition() bool {
return a.vendor
}
diff --git a/android/mutator.go b/android/mutator.go
index 04407eb..66a1bad 100644
--- a/android/mutator.go
+++ b/android/mutator.go
@@ -18,12 +18,13 @@
"github.com/google/blueprint"
)
-// Mutator phases:
-// Pre-arch
-// Arch
-// Pre-deps
-// Deps
-// PostDeps
+// Phases:
+// run Pre-arch mutators
+// run archMutator
+// run Pre-deps mutators
+// run depsMutator
+// run PostDeps mutators
+// continue on to GenerateAndroidBuildActions
func registerMutatorsToContext(ctx *blueprint.Context, mutators []*mutator) {
for _, t := range mutators {
diff --git a/android/paths.go b/android/paths.go
index 09f760a..f88d650 100644
--- a/android/paths.go
+++ b/android/paths.go
@@ -739,7 +739,7 @@
var partition string
if ctx.InstallInData() {
partition = "data"
- } else if ctx.Vendor() {
+ } else if ctx.InstallOnVendorPartition() {
partition = ctx.DeviceConfig().VendorPath()
} else {
partition = "system"