commit a7a4725ff4e7d38a56bb1fe70e89b40d334f5396
author Dan Willemsen <dwillemsen@google.com> Thu Oct 06 17:45:28 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Oct 06 17:45:28 2016 +0000
tree 61f9fd725825b1ffbda66ae9fc440b122cf3a1be
parent 5712322c4f7ba483161327e72eb64e8d93b4fdb2
parent 90d946e5777a699a796bc6aa979466858e22e919

Merge "Remove obsolete BOARD_BVB_ENABLE reference" into nyc-mr1-dev-plus-aosp

core/Makefile

diff --git a/core/Makefile b/core/Makefile
index 6c7ac53..57f1d81 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -539,17 +539,10 @@
 endif
 endif
 
-ifeq ($(BOARD_BVB_ENABLE),true)
-BOARD_KERNEL_CMDLINE := $(strip $(BOARD_KERNEL_CMDLINE))
-ifdef BOARD_KERNEL_CMDLINE
-  INTERNAL_BVBTOOL_MAKE_BOOT_IMAGE_ARGS += --kernel_cmdline "$(BOARD_KERNEL_CMDLINE)"
-endif
-else
 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
-endif
 
 INTERNAL_MKBOOTIMG_VERSION_ARGS := \
     --os_version $(PLATFORM_VERSION) \