From 3bcc137b490acde0219ff28f41b9433a19eef382 Mon Sep 17 00:00:00 2001 From: Badhri Jagan Sridharan Date: Fri, 17 Jun 2016 18:42:39 -0700 Subject: [PATCH] Add build variant to kernel command line Verity is not enabled in eng builds. Pass the build variant so that kernel does not try to enable verity in eng builds BUG:29276559 Change-Id: I7f412196ac59aa63e91c21d825ad15bae9f51691 --- core/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/Makefile b/core/Makefile index 1e81c14350..b69d9d9c30 100644 --- a/core/Makefile +++ b/core/Makefile @@ -516,7 +516,7 @@ VERITY_KEYID := veritykeyid=id:`openssl x509 -in $(PRODUCTS.$(INTERNAL_PRODUCT). endif endif -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