aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorColin Cross2017-01-18 12:33:55 -0600
committerColin Cross2017-01-18 12:33:55 -0600
commit596fa95feee0455298f73e6405bb2d5ff3a5800d (patch)
tree81c705000913faf269b33dcc6ea51b5c3907c646 /CleanSpec.mk
parent615b60bd54d380304da8eb1e08b5df4677fed0a1 (diff)
downloadsystem-sepolicy-596fa95feee0455298f73e6405bb2d5ff3a5800d.tar.gz
system-sepolicy-596fa95feee0455298f73e6405bb2d5ff3a5800d.tar.xz
system-sepolicy-596fa95feee0455298f73e6405bb2d5ff3a5800d.zip
Fix incremental builds
Some recent CLs changed the list of files that are installed in the root directory. Incremental builds have no way to uninstall files that were previously installed, which results in old stray files lying around. If the root directory is contained in system.img, this causes an error while building system.img: error: build_directory_structure: cannot lookup security context for /service_contexts Update CleanSpec.mk to remove files obsoleted by: Ide67d37d85273c60b9e387e72fbeb87be6da306a I7881af8922834dc69b37dae3b06d921e05206564 Ide67d37d85273c60b9e387e72fbeb87be6da306a This is not seen on the incremental build servers because they run make installclean between builds. Test: incremental build passes Change-Id: I22ecd1d3698404df352263fa99b56cb65247a23b
Diffstat (limited to 'CleanSpec.mk')
-rw-r--r--CleanSpec.mk7
1 files changed, 7 insertions, 0 deletions
diff --git a/CleanSpec.mk b/CleanSpec.mk
index f141e341..a00f8634 100644
--- a/CleanSpec.mk
+++ b/CleanSpec.mk
@@ -50,3 +50,10 @@
50 50
51$(call add-clean-step, rm -rf $(PRODUCT_OUT)/root/file_contexts) 51$(call add-clean-step, rm -rf $(PRODUCT_OUT)/root/file_contexts)
52$(call add-clean-step, rm -rf $(PRODUCT_OUT)/recovery/root/file_contexts) 52$(call add-clean-step, rm -rf $(PRODUCT_OUT)/recovery/root/file_contexts)
53
54$(call add-clean-step, rm -rf $(PRODUCT_OUT)/root/service_contexts)
55$(call add-clean-step, rm -rf $(PRODUCT_OUT)/recovery/root/service_contexts)
56$(call add-clean-step, rm -rf $(PRODUCT_OUT)/root/nonplat_property_contexts)
57$(call add-clean-step, rm -rf $(PRODUCT_OUT)/recovery/root/nonplat_property_contexts)
58$(call add-clean-step, rm -rf $(PRODUCT_OUT)/root/plat_property_contexts)
59$(call add-clean-step, rm -rf $(PRODUCT_OUT)/recovery/root/plat_property_contexts)