From 8e87853a04a104b20036f04379cfd6f00b9d3c95 Mon Sep 17 00:00:00 2001 From: Alex Klyubin Date: Thu, 2 Mar 2017 12:58:38 -0800 Subject: Include secilc and sepolicy conditionally, elsewhere This removes the unconditional inclusion of secilc and sepolicy. These artefacts are now conditionally included by system/core/init. The reason for declaring the conditional inclusion there is because the desired conditional inclusion based on PRODUCT_FULL_TREBLE cannot be declared here because PRODUCT_FULL_TREBLE is not yet available when this file is interpreted. Test: Device boots, no additional SELinux denials. This test is performed on a device with PRODUCT_FULL_TREBLE set to true, and on a device with PRODUCT_FULL_TREBLE set to false. Test: Device with PRODUCT_FULL_TREBLE set to true contains secilc and the three *.cil files, but does not contain the sepolicy file. Device with PRODUCT_FULL_TREBLE set to false contains sepolicy file but does not contain the secilc file or any *.cil files. Bug: 31363362 Change-Id: Ia3f38948b71a054918f5f63c594ba62a033e1066 --- target/product/embedded.mk | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/target/product/embedded.mk b/target/product/embedded.mk index 8b40fe0adb..e26c62858d 100644 --- a/target/product/embedded.mk +++ b/target/product/embedded.mk @@ -84,7 +84,6 @@ PRODUCT_PACKAGES += \ # SELinux packages PRODUCT_PACKAGES += \ - secilc \ file_contexts.bin \ nonplat_file_contexts \ nonplat_mac_permissions.xml \ @@ -96,8 +95,7 @@ PRODUCT_PACKAGES += \ plat_property_contexts \ plat_seapp_contexts \ plat_service_contexts \ - selinux_version \ - sepolicy + selinux_version # AID Generation for # and -- cgit v1.2.3