From 74482f5328484f143ab9a6135a01039a94230336 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thi=C3=A9baud=20Weksteen?= Date: Wed, 26 Apr 2023 13:46:59 +1000 Subject: [PATCH] Remove comments in service_contexts Commit b554e59 converted the build rules of contexts to Soong. Previously, both services_contexts and hwservice_contexts were stripped of comments. This is useful as a CTS test (testAospServiceContexts) ensures that the device service_contexts matches AOSP. Restore the previous behaviour. Bug: 279384270 Test: m selinux_policy; diff plat_service_contexts; no more comments Change-Id: Id0245efacf4e4b123f805869d95bacf804ccb915 --- build/soong/selinux_contexts.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build/soong/selinux_contexts.go b/build/soong/selinux_contexts.go index 6a971da12..7faafc683 100644 --- a/build/soong/selinux_contexts.go +++ b/build/soong/selinux_contexts.go @@ -333,7 +333,7 @@ func fileFactory() android.Module { return m } -func (m *selinuxContextsModule) buildHwServiceContexts(ctx android.ModuleContext, inputs android.Paths) android.Path { +func (m *selinuxContextsModule) buildServiceContexts(ctx android.ModuleContext, inputs android.Paths) android.Path { if m.properties.Remove_comment == nil { m.properties.Remove_comment = proptools.BoolPtr(true) } @@ -478,7 +478,7 @@ func (m *selinuxContextsModule) buildSeappContexts(ctx android.ModuleContext, in func hwServiceFactory() android.Module { m := newModule() - m.build = m.buildHwServiceContexts + m.build = m.buildServiceContexts return m } @@ -491,7 +491,7 @@ func propertyFactory() android.Module { func serviceFactory() android.Module { m := newModule() - m.build = m.buildGeneralContexts + m.build = m.buildServiceContexts return m }