Soong support for namespaces
Bug: 65683273
Test: build/soong/scripts/diff_build_graphs.sh \
--products=aosp_arm \
'build/blueprint:work^ build/soong:work^' \
'build/blueprint:work build/soong:work'
# and see that the only changes were:
# 1. adding some new files
# 2. changing some line numbers
Test: m -j nothing # which runs unit tests
Change-Id: I6d3e52ef62c4cabe85b9a135a54de0e1a6aab29c
diff --git a/android/module.go b/android/module.go
index 0eb4820..1608f4b 100644
--- a/android/module.go
+++ b/android/module.go
@@ -211,6 +211,8 @@
ArchSpecific bool `blueprint:"mutated"`
SkipInstall bool `blueprint:"mutated"`
+
+ NamespaceExportedToMake bool `blueprint:"mutated"`
}
type hostAndDeviceProperties struct {
@@ -476,8 +478,13 @@
var deps Paths
+ namespacePrefix := ctx.Namespace().(*Namespace).id
+ if namespacePrefix != "" {
+ namespacePrefix = namespacePrefix + "-"
+ }
+
if len(allInstalledFiles) > 0 {
- name := PathForPhony(ctx, ctx.ModuleName()+"-install")
+ name := PathForPhony(ctx, namespacePrefix+ctx.ModuleName()+"-install")
ctx.Build(pctx, BuildParams{
Rule: blueprint.Phony,
Output: name,
@@ -489,7 +496,7 @@
}
if len(allCheckbuildFiles) > 0 {
- name := PathForPhony(ctx, ctx.ModuleName()+"-checkbuild")
+ name := PathForPhony(ctx, namespacePrefix+ctx.ModuleName()+"-checkbuild")
ctx.Build(pctx, BuildParams{
Rule: blueprint.Phony,
Output: name,
@@ -505,9 +512,10 @@
suffix = "-soong"
}
+ name := PathForPhony(ctx, namespacePrefix+ctx.ModuleName()+suffix)
ctx.Build(pctx, BuildParams{
Rule: blueprint.Phony,
- Output: PathForPhony(ctx, ctx.ModuleName()+suffix),
+ Outputs: []WritablePath{name},
Implicits: deps,
})