From 342b58a2eecf856302e2e44038e5db1db87218d2 Mon Sep 17 00:00:00 2001 From: Felix Date: Mon, 2 Mar 2020 16:13:12 +0100 Subject: [PATCH] property_contexts: Drop COMPATIBLE_PROP guard public/property_contexts needs to be included regardless of API level so that the property *labels* are always included. Else, devices without PRODUCT_COMPATIBLE_PROPERTY (shipping API level <27) will run into denials because the props are labeled `default_prop`. As a side benefit, this reduces deviation in test matrices. The guard was originally introduced in: e49714542e "Whitelist exported platform properties" Test: Build for device without PRODUCT_COMPATIBLE_PROPERTY, no more denials for accessing `default_prop` from e.g. HALs. Change-Id: I5bbe5d078040bb26dd48d353953661c9375d2009 Signed-off-by: Felix --- build/soong/selinux_contexts.go | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/build/soong/selinux_contexts.go b/build/soong/selinux_contexts.go index 03f8f199f..6a7123bd2 100644 --- a/build/soong/selinux_contexts.go +++ b/build/soong/selinux_contexts.go @@ -149,10 +149,7 @@ func (m *selinuxContextsModule) GenerateAndroidBuildActions(ctx android.ModuleCo inputs = append(inputs, segroup.SystemExtPrivateSrcs()...) } else { inputs = append(inputs, segroup.SystemPrivateSrcs()...) - - if ctx.Config().ProductCompatibleProperty() { - inputs = append(inputs, segroup.SystemPublicSrcs()...) - } + inputs = append(inputs, segroup.SystemPublicSrcs()...) } if proptools.Bool(m.properties.Reqd_mask) {