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

Commit 674721e9 authored by Jooyung Han's avatar Jooyung Han Committed by Automerger Merge Worker
Browse files

Merge "Use file_contexts for flattened apexes" am: a00c0f1f 

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

Change-Id: I2f92d53210523cc2d81c9e28392b0758a3eb7ea8
parents 5da79a18 a00c0f1f

core/Makefile

+6 −0
Original line number Diff line number Diff line
@@ -1289,7 +1289,13 @@ 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)



ifeq (true,$(PRODUCT_USE_DYNAMIC_PARTITIONS))

core/base_rules.mk

+3 −0
Original line number Diff line number Diff line
@@ -987,6 +987,9 @@ ALL_MODULES.$(my_register_name).COMPATIBILITY_SUITES := $(LOCAL_COMPATIBILITY_SU 
ALL_MODULES.$(my_register_name).TEST_CONFIG := $(test_config)

ALL_MODULES.$(my_register_name).EXTRA_TEST_CONFIGS := $(LOCAL_EXTRA_FULL_TEST_CONFIGS)

ALL_MODULES.$(my_register_name).TEST_MAINLINE_MODULES := $(LOCAL_TEST_MAINLINE_MODULES)

ifndef LOCAL_IS_HOST_MODULE

ALL_MODULES.$(my_register_name).FILE_CONTEXTS := $(LOCAL_FILE_CONTEXTS)

endif

test_config :=



INSTALLABLE_FILES.$(LOCAL_INSTALLED_MODULE).MODULE := $(my_register_name)

core/clear_vars.mk

+1 −0
Original line number Diff line number Diff line
@@ -102,6 +102,7 @@ LOCAL_EXTRA_FULL_TEST_CONFIGS:= 
LOCAL_EXTRACT_APK:=

LOCAL_EXTRACT_DPI_APK:=

LOCAL_FDO_SUPPORT:=

LOCAL_FILE_CONTEXTS:=

LOCAL_FINDBUGS_FLAGS:=

LOCAL_FORCE_STATIC_EXECUTABLE:=

LOCAL_FULL_CLASSES_JACOCO_JAR:=