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

Commit faf2b03f authored by Romain Hunault's avatar Romain Hunault 🚴🏻
Browse files

Merge remote-tracking branch 'origin/lineage-18.1' into v1-r

parents cb706de8 6645834d

core/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -1278,7 +1278,7 @@ $(error TARGET_BOOTIMAGE_USE_EXT2 is not supported anymore) 


else ifeq (true,$(BOARD_AVB_ENABLE)) # TARGET_BOOTIMAGE_USE_EXT2 != true



$(INSTALLED_BOOTIMAGE_TARGET): $(MKBOOTIMG) $(AVBTOOL) $(INTERNAL_BOOTIMAGE_FILES) $(BOARD_AVB_BOOT_KEY_PATH)

$(INSTALLED_BOOTIMAGE_TARGET): $(MKBOOTIMG) $(AVBTOOL) $(INTERNAL_BOOTIMAGE_FILES) $(BOARD_AVB_BOOT_KEY_PATH) $(BOOTIMAGE_EXTRA_DEPS)

	$(call pretty,"Target boot image: $@")

	$(hide) $(MKBOOTIMG) $(INTERNAL_BOOTIMAGE_ARGS) $(INTERNAL_MKBOOTIMG_VERSION_ARGS) $(BOARD_MKBOOTIMG_ARGS) --output $@

	$(hide) $(call assert-max-image-size,$@,$(call get-hash-image-max-size,$(BOARD_BOOTIMAGE_PARTITION_SIZE)))
@@ -1301,7 +1301,7 @@ bootimage-nodeps: $(MKBOOTIMG) $(AVBTOOL) $(BOARD_AVB_BOOT_KEY_PATH) 


else ifeq (true,$(PRODUCT_SUPPORTS_BOOT_SIGNER)) # BOARD_AVB_ENABLE != true



$(INSTALLED_BOOTIMAGE_TARGET): $(MKBOOTIMG) $(INTERNAL_BOOTIMAGE_FILES) $(BOOT_SIGNER)

$(INSTALLED_BOOTIMAGE_TARGET): $(MKBOOTIMG) $(INTERNAL_BOOTIMAGE_FILES) $(BOOT_SIGNER) $(BOOTIMAGE_EXTRA_DEPS)

	$(call pretty,"Target boot image: $@")

	$(hide) $(MKBOOTIMG) $(INTERNAL_BOOTIMAGE_ARGS) $(INTERNAL_MKBOOTIMG_VERSION_ARGS) $(BOARD_MKBOOTIMG_ARGS) --output $@

	$(BOOT_SIGNER) /boot $@ $(PRODUCT_VERITY_SIGNING_KEY).pk8 $(PRODUCT_VERITY_SIGNING_KEY).x509.pem $@

core/tasks/check_boot_jars/package_allowed_list.txt

+6 −0
Original line number Diff line number Diff line
@@ -267,3 +267,9 @@ org\.codeaurora\.internal.* 
###################################################

# IFAA Manager used for Alipay and/or WeChat payment

org\.ifaa\.android\.manager.*



###################################################

# Nvidia services

com\.nvidia\.*

com\.nvidia\.profilemanager\.*

com\.nvidia\.NvCPLSvc\.*

core/version_defaults.mk

+1 −1
Original line number Diff line number Diff line
@@ -240,7 +240,7 @@ ifndef PLATFORM_SECURITY_PATCH 
    #  It must be of the form "YYYY-MM-DD" on production devices.

    #  It must match one of the Android Security Patch Level strings of the Public Security Bulletins.

    #  If there is no $PLATFORM_SECURITY_PATCH set, keep it empty.

      PLATFORM_SECURITY_PATCH := 2022-01-05

      PLATFORM_SECURITY_PATCH := 2022-03-05

endif



ifndef PLATFORM_SECURITY_PATCH_TIMESTAMP

tools/releasetools/common.py

+1 −1
Original line number Diff line number Diff line
@@ -509,7 +509,7 @@ class BuildInfo(object): 
    return self.GetBuildProp(key)



  def GetPartitionFingerprint(self, partition):

    return self._partition_fingerprints.get(partition, None)

    return self._partition_fingerprints.get(partition, self.CalculateFingerprint())



  def CalculatePartitionFingerprint(self, partition):

    try: