Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a8c3db9d authored Jan 19, 2024 by Inseob Kim Committed by Automerger Merge Worker Jan 19, 2024

Merge "Remove LOCAL_FILE_CONTEXTS" into main am: 2f7809b4

Original change: https://android-review.googlesource.com/c/platform/build/+/2915726

Change-Id: I53be4f42417950985827ea3224a636afb8c37d36
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

parents 98e8e1d2 2f7809b4

core/Makefile

+0 −5

Original line number	Diff line number	Diff line
		@@ -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)

core/base_rules.mk

+0 −1

Original line number	Diff line number	Diff line
		@@ -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 :=

core/clear_vars.mk

+0 −1

Original line number	Diff line number	Diff line
		@@ -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:=