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

Commit 5f79bcdd authored by Nick Kralevich's avatar Nick Kralevich Committed by Gerrit Code Review
Browse files

Merge changes from topic 'file_contexts.bin' 

* changes:
  build: switch over to file_contexts.bin only
  Update embedded.mk to support file_contexts.bin
parents 8f301ff1 d3a803e6

core/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -695,7 +695,7 @@ ifeq (true,$(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_SUPPORTS_VERITY)) 
INTERNAL_USERIMAGES_DEPS += $(BUILD_VERITY_TREE) $(APPEND2SIMG) $(VERITY_SIGNER)

endif



SELINUX_FC := $(TARGET_ROOT_OUT)/file_contexts

SELINUX_FC := $(TARGET_ROOT_OUT)/file_contexts.bin

INTERNAL_USERIMAGES_DEPS += $(SELINUX_FC)



# $(1): the path of the output dictionary file
@@ -1483,7 +1483,7 @@ endif 
	$(hide) $(ACP) $(APKCERTS_FILE) $(zip_root)/META/apkcerts.txt

	$(hide) if test -e $(tool_extensions)/releasetools.py; then $(ACP) $(tool_extensions)/releasetools.py $(zip_root)/META/; fi

	$(hide) echo "$(PRODUCT_OTA_PUBLIC_KEYS)" > $(zip_root)/META/otakeys.txt

	$(hide) $(ACP) $(SELINUX_FC) $(zip_root)/META/file_contexts

	$(hide) $(ACP) $(SELINUX_FC) $(zip_root)/META/file_contexts.bin

	$(hide) echo "recovery_api_version=$(PRIVATE_RECOVERY_API_VERSION)" > $(zip_root)/META/misc_info.txt

	$(hide) echo "fstab_version=$(PRIVATE_RECOVERY_FSTAB_VERSION)" >> $(zip_root)/META/misc_info.txt

ifdef BOARD_FLASH_BLOCK_SIZE

target/product/embedded.mk

+1 −1
Original line number Diff line number Diff line
@@ -75,7 +75,7 @@ PRODUCT_PACKAGES += \ 
# SELinux packages

PRODUCT_PACKAGES += \

    sepolicy \

    file_contexts \

    file_contexts.bin \

    seapp_contexts \

    property_contexts \

    mac_permissions.xml \

tools/releasetools/common.py

+4 −4
Original line number Diff line number Diff line
@@ -154,16 +154,16 @@ def LoadInfoDict(input_file, input_dir=None): 
  # are doing repacking. Redirect those properties to the actual files in the

  # unzipped directory.

  if input_dir is not None:

    # We carry a copy of file_contexts under META/. If not available, search

    # BOOT/RAMDISK/. Note that sometimes we may need a different file_contexts

    # We carry a copy of file_contexts.bin under META/. If not available,

    # search BOOT/RAMDISK/. Note that sometimes we may need a different file

    # to build images than the one running on device, such as when enabling

    # system_root_image. In that case, we must have the one for image

    # generation copied to META/.

    fc_config = os.path.join(input_dir, "META", "file_contexts")

    fc_config = os.path.join(input_dir, "META", "file_contexts.bin")

    if d.get("system_root_image") == "true":

      assert os.path.exists(fc_config)

    if not os.path.exists(fc_config):

      fc_config = os.path.join(input_dir, "BOOT", "RAMDISK", "file_contexts")

      fc_config = os.path.join(input_dir, "BOOT", "RAMDISK", "file_contexts.bin")

      if not os.path.exists(fc_config):

        fc_config = None

tools/releasetools/ota_from_target_files.py

+2 −2
Original line number Diff line number Diff line
@@ -585,8 +585,8 @@ else if get_stage("%(bcb_dev)s") == "3/3" then 
  if HasVendorPartition(input_zip):

    system_progress -= 0.1



  # Place a copy of file_contexts into the OTA package which will be used by

  # the recovery program.

  # Place a copy of file_contexts.bin into the OTA package which will be used

  # by the recovery program.

  if "selinux_fc" in OPTIONS.info_dict:

    WritePolicyConfig(OPTIONS.info_dict["selinux_fc"], output_zip)