Revert "Soong support for namespaces"
This reverts commit 63a250a336a1b910836eeb4caebcf5b4f8d91c2a.
Reason for revert: Some failures:
namespace_test.go:648: dir1/Blueprints:2:4: a namespace must be the first module in the file
such as New Build Breakage: aosp-master/build_test @ 4475274
Change-Id: I1b5db8eb934e51ff22241bfca44199d886b1393b
diff --git a/android/module.go b/android/module.go
index 1608f4b..0eb4820 100644
--- a/android/module.go
+++ b/android/module.go
@@ -211,8 +211,6 @@
ArchSpecific bool `blueprint:"mutated"`
SkipInstall bool `blueprint:"mutated"`
-
- NamespaceExportedToMake bool `blueprint:"mutated"`
}
type hostAndDeviceProperties struct {
@@ -478,13 +476,8 @@
var deps Paths
- namespacePrefix := ctx.Namespace().(*Namespace).id
- if namespacePrefix != "" {
- namespacePrefix = namespacePrefix + "-"
- }
-
if len(allInstalledFiles) > 0 {
- name := PathForPhony(ctx, namespacePrefix+ctx.ModuleName()+"-install")
+ name := PathForPhony(ctx, ctx.ModuleName()+"-install")
ctx.Build(pctx, BuildParams{
Rule: blueprint.Phony,
Output: name,
@@ -496,7 +489,7 @@
}
if len(allCheckbuildFiles) > 0 {
- name := PathForPhony(ctx, namespacePrefix+ctx.ModuleName()+"-checkbuild")
+ name := PathForPhony(ctx, ctx.ModuleName()+"-checkbuild")
ctx.Build(pctx, BuildParams{
Rule: blueprint.Phony,
Output: name,
@@ -512,10 +505,9 @@
suffix = "-soong"
}
- name := PathForPhony(ctx, namespacePrefix+ctx.ModuleName()+suffix)
ctx.Build(pctx, BuildParams{
Rule: blueprint.Phony,
- Outputs: []WritablePath{name},
+ Output: PathForPhony(ctx, ctx.ModuleName()+suffix),
Implicits: deps,
})