commit 997c9af7b12389fe20c12fea2f00edbb2772f4a1
author Badhri Jagan Sridharan <Badhri@google.com> Fri Jun 17 18:42:39 2016 -0700
committer Badhri Jagan Sridharan <badhri@google.com> Tue Jun 28 23:36:45 2016 +0000
tree 974d3d13e7b5750b362a64f81665203a88ee688d
parent 606ad22def45e05fb336673ef861f24b9f3e4b18

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

diff --git a/core/Makefile b/core/Makefile
index 79faae1..cdf24dd 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -550,7 +550,7 @@
 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