Merge "Remove comments in service_contexts" am: 97a5408aca am: 7d9b05e014 am: ebe909c195 am: f5d8bbb320

Original change: https://android-review.googlesource.com/c/platform/system/sepolicy/+/2564530

Change-Id: Ib65f91698c3bcb4b7e761d602dff8abd3d64e845
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Thiébaud Weksteen 2023-04-27 19:34:11 +00:00 committed by Automerger Merge Worker
commit 667316c930

View file

@ -333,7 +333,7 @@ func fileFactory() android.Module {
return m 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 { if m.properties.Remove_comment == nil {
m.properties.Remove_comment = proptools.BoolPtr(true) m.properties.Remove_comment = proptools.BoolPtr(true)
} }
@ -478,7 +478,7 @@ func (m *selinuxContextsModule) buildSeappContexts(ctx android.ModuleContext, in
func hwServiceFactory() android.Module { func hwServiceFactory() android.Module {
m := newModule() m := newModule()
m.build = m.buildHwServiceContexts m.build = m.buildServiceContexts
return m return m
} }
@ -491,7 +491,7 @@ func propertyFactory() android.Module {
func serviceFactory() android.Module { func serviceFactory() android.Module {
m := newModule() m := newModule()
m.build = m.buildGeneralContexts m.build = m.buildServiceContexts
return m return m
} }