Revert^3 "Build userdebug_plat_sepolicy.cil with Android.bp"
e10ceab330e43b53fa4da52c2c82c653d81925cd
Change-Id: Ia1b38d6b709edb0e819ea4700e70ba68b1b61332
diff --git a/build/soong/policy.go b/build/soong/policy.go
index 9d574c9..d734c97 100644
--- a/build/soong/policy.go
+++ b/build/soong/policy.go
@@ -317,12 +317,7 @@
conf := android.PathForModuleSrc(ctx, *c.properties.Src)
cil := c.compileConfToCil(ctx, conf)
- if c.InstallInDebugRamdisk() {
- // for userdebug_plat_sepolicy.cil
- c.installPath = android.PathForModuleInstall(ctx)
- } else {
- c.installPath = android.PathForModuleInstall(ctx, "etc", "selinux")
- }
+ c.installPath = android.PathForModuleInstall(ctx, "etc", "selinux")
c.installSource = cil
ctx.InstallFile(c.installPath, c.stem(), c.installSource)
diff --git a/build/soong/selinux_contexts.go b/build/soong/selinux_contexts.go
index a9aed60..d7a0798 100644
--- a/build/soong/selinux_contexts.go
+++ b/build/soong/selinux_contexts.go
@@ -257,10 +257,6 @@
return false
}
-func (m *selinuxContextsModule) DebugRamdiskVariantNeeded(ctx android.BaseModuleContext) bool {
- return false
-}
-
func (m *selinuxContextsModule) RecoveryVariantNeeded(ctx android.BaseModuleContext) bool {
return m.InstallInRecovery() || proptools.Bool(m.properties.Recovery_available)
}