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

Commit 9898553d authored by Badhri Jagan Sridharan's avatar Badhri Jagan Sridharan
Browse files

resolve merge conflicts of 00046ad5 to nyc-mr1-dev-plus-aosp 

Change-Id: I9540ecace4b20e8931fdf591e2d6604caf194f4c
parents 959e62c5 00046ad5

core/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -541,7 +541,7 @@ ifdef BOARD_KERNEL_CMDLINE 
  INTERNAL_BVBTOOL_MAKE_BOOT_IMAGE_ARGS += --kernel_cmdline "$(BOARD_KERNEL_CMDLINE)"

endif

else

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

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

ifdef BOARD_KERNEL_CMDLINE

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

endif