Use OutputFilesProvider on certain module types
The module types below no longer implement OutputFileProducer, but
use OutputFilesProvider for output files inter-module-communication.
se_policy_conf
se_policy_cil
se_policy_binary
se_compat_cil
se_versioned_policy
Test: CI
Bug: 339477385
Change-Id: I87d1845162f91065acd7d2f6c27fd7583cc8b5e0
diff --git a/build/soong/versioned_policy.go b/build/soong/versioned_policy.go
index be396e3..9c8b9cd 100644
--- a/build/soong/versioned_policy.go
+++ b/build/soong/versioned_policy.go
@@ -15,7 +15,6 @@
package selinux
import (
- "fmt"
"os"
"strconv"
@@ -163,6 +162,8 @@
m.installPath = m.installPath.Join(ctx, subdir)
}
ctx.InstallFile(m.installPath, m.installSource.Base(), m.installSource)
+
+ ctx.SetOutputFiles(android.Paths{m.installSource}, "")
}
func (m *versionedPolicy) AndroidMkEntries() []android.AndroidMkEntries {
@@ -178,12 +179,3 @@
},
}}
}
-
-func (m *versionedPolicy) OutputFiles(tag string) (android.Paths, error) {
- if tag == "" {
- return android.Paths{m.installSource}, nil
- }
- return nil, fmt.Errorf("Unknown tag %q", tag)
-}
-
-var _ android.OutputFileProducer = (*policyConf)(nil)