Skip to content

Commit 0734dbc

Browse files
tweksteenCherrypicker Worker
authored and
Cherrypicker Worker
committed
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 (cherry picked from https://android-review.googlesource.com/q/commit:74482f5328484f143ab9a6135a01039a94230336) Merged-In: Id0245efacf4e4b123f805869d95bacf804ccb915 Change-Id: Id0245efacf4e4b123f805869d95bacf804ccb915
1 parent f6f4205 commit 0734dbc

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

build/soong/selinux_contexts.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -333,7 +333,7 @@ func fileFactory() android.Module {
333333
return m
334334
}
335335

336-
func (m *selinuxContextsModule) buildHwServiceContexts(ctx android.ModuleContext, inputs android.Paths) android.Path {
336+
func (m *selinuxContextsModule) buildServiceContexts(ctx android.ModuleContext, inputs android.Paths) android.Path {
337337
if m.properties.Remove_comment == nil {
338338
m.properties.Remove_comment = proptools.BoolPtr(true)
339339
}
@@ -478,7 +478,7 @@ func (m *selinuxContextsModule) buildSeappContexts(ctx android.ModuleContext, in
478478

479479
func hwServiceFactory() android.Module {
480480
m := newModule()
481-
m.build = m.buildHwServiceContexts
481+
m.build = m.buildServiceContexts
482482
return m
483483
}
484484

@@ -491,7 +491,7 @@ func propertyFactory() android.Module {
491491

492492
func serviceFactory() android.Module {
493493
m := newModule()
494-
m.build = m.buildGeneralContexts
494+
m.build = m.buildServiceContexts
495495
return m
496496
}
497497

0 commit comments

Comments
 (0)