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

Commit 45373976 authored by Badhri Jagan Sridharan's avatar Badhri Jagan Sridharan Committed by android-build-merger
Browse files

Merge \"Extract public key ID from cert\" 

am: 606ad22d

Change-Id: Idfc1ff8ec8766d4b15a5b1908a8eb830e28b42f3
parents 90f03ecf 606ad22d

core/Makefile

+12 −6
Original line number Diff line number Diff line
@@ -518,12 +518,6 @@ endif 


INTERNAL_BOOTIMAGE_FILES := $(filter-out --%,$(INTERNAL_BOOTIMAGE_ARGS))



BOARD_KERNEL_CMDLINE := $(strip $(BOARD_KERNEL_CMDLINE))

ifdef BOARD_KERNEL_CMDLINE

  INTERNAL_BOOTIMAGE_ARGS += --cmdline "$(BOARD_KERNEL_CMDLINE)"

  INTERNAL_BVBTOOL_MAKE_BOOT_IMAGE_ARGS += --kernel_cmdline "$(BOARD_KERNEL_CMDLINE)"

endif



BOARD_KERNEL_BASE := $(strip $(BOARD_KERNEL_BASE))

ifdef BOARD_KERNEL_BASE

  INTERNAL_BOOTIMAGE_ARGS += --base $(BOARD_KERNEL_BASE)
@@ -534,6 +528,18 @@ ifdef BOARD_KERNEL_PAGESIZE 
  INTERNAL_BOOTIMAGE_ARGS += --pagesize $(BOARD_KERNEL_PAGESIZE)

endif



ifeq ($(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_SUPPORTS_VERITY),true)

ifeq ($(BOARD_BUILD_SYSTEM_ROOT_IMAGE),true)

VERITY_KEYID := veritykeyid=id:`openssl x509 -in $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_VERITY_SIGNING_KEY).x509.pem -text \

                | grep keyid | sed 's/://g' | tr -d '[:space:]' | tr '[:upper:]' '[:lower:]' | sed 's/keyid//g'`

endif

endif



BOARD_KERNEL_CMDLINE := $(strip $(BOARD_KERNEL_CMDLINE) $(VERITY_KEYID))

ifdef BOARD_KERNEL_CMDLINE

INTERNAL_BOOTIMAGE_ARGS += --cmdline "$(BOARD_KERNEL_CMDLINE)"

endif



INTERNAL_MKBOOTIMG_VERSION_ARGS := \

    --os_version $(PLATFORM_VERSION) \

    --os_patch_level $(PLATFORM_SECURITY_PATCH)