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

Commit 41792255 authored by Steven Moreland's avatar Steven Moreland
Browse files

Remove PRODUCT_SEPOLICY_SPLIT. 

Obsolete.

Bug: 257176017
Test: build&boot
Change-Id: I7ac95f8e55254b7c07ee5e5ba6c18c23a432bfa1
parent d5d51e21

core/config.mk

+2 −9
Original line number Diff line number Diff line
@@ -43,6 +43,8 @@ endif 
CHANGES_URL := https://android.googlesource.com/platform/build/+/master/Changes.md

.KATI_READONLY := CHANGES_URL

$(KATI_deprecated_var TARGET_USES_64_BIT_BINDER,All devices use 64-bit binder by default now. Uses of TARGET_USES_64_BIT_BINDER should be removed.)

$(KATI_deprecated_var PRODUCT_SEPOLICY_SPLIT,All devices are built with split sepolicy.)

$(KATI_deprecated_var PRODUCT_SEPOLICY_SPLIT_OVERRIDE,All devices are built with split sepolicy.)

$(KATI_obsolete_var PATH,Do not use PATH directly. See $(CHANGES_URL)#PATH)

$(KATI_obsolete_var PYTHONPATH,Do not use PYTHONPATH directly. See $(CHANGES_URL)#PYTHONPATH)

$(KATI_obsolete_var OUT,Use OUT_DIR instead. See $(CHANGES_URL)#OUT)
@@ -736,7 +738,6 @@ endif 


requirements := \

    PRODUCT_TREBLE_LINKER_NAMESPACES \

    PRODUCT_SEPOLICY_SPLIT \

    PRODUCT_ENFORCE_VINTF_MANIFEST \

    PRODUCT_NOTICE_SPLIT
@@ -751,14 +752,6 @@ $(foreach req,$(requirements),$(eval \ 
PRODUCT_FULL_TREBLE_OVERRIDE ?=

$(foreach req,$(requirements),$(eval $(req)_OVERRIDE ?=))



ifneq ($(PRODUCT_SEPOLICY_SPLIT),true)

# WARNING: DO NOT CHANGE: if you are downstream of AOSP, and you change this, without

# letting upstream know it's important to you, we may do cleanup which breaks this

# significantly. Please let us know if you are changing this.

# TODO(b/257176017) - unsplit sepolicy is no longer supported

PRODUCT_SEPOLICY_SPLIT := true

endif



# TODO(b/114488870): disallow PRODUCT_FULL_TREBLE_OVERRIDE from being used.

.KATI_READONLY := \

    PRODUCT_FULL_TREBLE_OVERRIDE \

core/main.mk

+1 −3
Original line number Diff line number Diff line
@@ -180,9 +180,7 @@ TARGET_BUILD_JAVA_SUPPORT_LEVEL :=$= platform 
ADDITIONAL_SYSTEM_PROPERTIES += ro.treble.enabled=${PRODUCT_FULL_TREBLE}



$(KATI_obsolete_var PRODUCT_FULL_TREBLE,\

	Code should be written to work regardless of a device being Treble or \

	variables like PRODUCT_SEPOLICY_SPLIT should be used until that is \

	possible.)

	Code should be written to work regardless of a device being Treble)



# Sets ro.actionable_compatible_property.enabled to know on runtime whether the

# allowed list of actionable compatible properties is enabled or not.

core/soong_config.mk

+0 −2
Original line number Diff line number Diff line
@@ -302,8 +302,6 @@ $(call add_json_bool, RequiresInsecureExecmemForSwiftshader, $(filter true,$(PRO 


$(call add_json_bool, SelinuxIgnoreNeverallows, $(filter true,$(SELINUX_IGNORE_NEVERALLOWS)))



$(call add_json_bool, SepolicySplit, $(filter true,$(PRODUCT_SEPOLICY_SPLIT)))



$(call add_json_list, SepolicyFreezeTestExtraDirs,         $(SEPOLICY_FREEZE_TEST_EXTRA_DIRS))

$(call add_json_list, SepolicyFreezeTestExtraPrebuiltDirs, $(SEPOLICY_FREEZE_TEST_EXTRA_PREBUILT_DIRS))