diff --git a/core/Makefile b/core/Makefile index 6edac1ab0a..90312d0c4d 100644 --- a/core/Makefile +++ b/core/Makefile @@ -2094,11 +2094,6 @@ endif # Get a colon-separated list of search paths. INTERNAL_USERIMAGES_BINARY_PATHS := $(subst $(space),:,$(sort $(dir $(INTERNAL_USERIMAGES_DEPS)))) -# Collects file_contexts files from modules to be installed -$(call merge-fc-files, \ - $(sort $(foreach m,$(product_MODULES),$(ALL_MODULES.$(m).FILE_CONTEXTS))),\ - $(call intermediates-dir-for,ETC,file_contexts.bin)/file_contexts.modules.tmp) - SELINUX_FC := $(call intermediates-dir-for,ETC,file_contexts.bin)/file_contexts.bin INTERNAL_USERIMAGES_DEPS += $(SELINUX_FC) diff --git a/core/base_rules.mk b/core/base_rules.mk index 254bfeb21f..1793f00008 100644 --- a/core/base_rules.mk +++ b/core/base_rules.mk @@ -1187,7 +1187,6 @@ ALL_MODULES.$(my_register_name).FOR_2ND_ARCH := true endif ALL_MODULES.$(my_register_name).FOR_HOST_CROSS := $(my_host_cross) ifndef LOCAL_IS_HOST_MODULE -ALL_MODULES.$(my_register_name).FILE_CONTEXTS := $(LOCAL_FILE_CONTEXTS) ALL_MODULES.$(my_register_name).APEX_KEYS_FILE := $(LOCAL_APEX_KEY_PATH) endif test_config := diff --git a/core/clear_vars.mk b/core/clear_vars.mk index 2b84fcdb84..8d99176ca4 100644 --- a/core/clear_vars.mk +++ b/core/clear_vars.mk @@ -87,7 +87,6 @@ LOCAL_EXPORT_STATIC_LIBRARY_HEADERS:= LOCAL_EXTRA_FULL_TEST_CONFIGS:= LOCAL_EXTRACT_APK:= LOCAL_EXTRACT_DPI_APK:= -LOCAL_FILE_CONTEXTS:= LOCAL_FINDBUGS_FLAGS:= LOCAL_FORCE_STATIC_EXECUTABLE:= LOCAL_FULL_CLASSES_JACOCO_JAR:=