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

Commit 6fdf9387 authored Mar 27, 2017 by Jiyong Park

Remove marlin/sailfish specific sepolicy

Don't use sepolicy dir for marlin/sailfish.

Bug: 36231802
Test: aosp_arm64_ab should boot
Change-Id: I0e76841530cec2c51b61251ffde802bd7ec10663

parent 8f5c5fd7

target/board/generic_arm64_ab/BoardConfig.mk

+4 −6

Original line number	Diff line number	Diff line
		@@ -85,10 +85,8 @@ BOARD_SYSTEMIMAGE_PARTITION_SIZE := 2147483648
		BOARD_NAND_SPARE_SIZE := 0
		BOARD_FLASH_BLOCK_SIZE := 512

		###############################################################################
		# Below are sailfish/marlin specific configs.
		# Must be moved after early-mount is supported.
		###############################################################################
		BOARD_SEPOLICY_DIRS += device/google/marlin/sepolicy

		BOARD_PROPERTY_OVERRIDES_SPLIT_ENABLED := true

		# TODO(b/36764215): remove this setting when the generic system image
		# no longer has QCOM-specific directories under /.
		BOARD_SEPOLICY_DIRS += build/target/board/generic_arm64_ab/sepolicy

target/board/generic_arm64_ab/sepolicy/file.te

0 → 100644

+7 −0

Original line number	Diff line number	Diff line
		# TODO(b/36764215): remove this file when the generic system image
		# no longer has these directories
		type bt_firmware_file, file_type;
		type persist_file, file_type;

		# Default type for anything under /firmware.
		type firmware_file, fs_type, contextmount_type;

target/board/generic_arm64_ab/sepolicy/file_contexts

0 → 100644

+13 −0

Original line number	Diff line number	Diff line
		# TODO(b/36764215): remove this file when the generic system image
		# no longer has these directories. They are specific to QCOM.

		# /
		/bt_firmware(/.*)? u:object_r:bt_firmware_file:s0
		/tombstones u:object_r:rootfs:s0
		/dsp u:object_r:rootfs:s0

		# /persist
		/persist(/.*)? u:object_r:persist_file:s0

		# files in firmware
		/firmware(/.*)? u:object_r:firmware_file:s0