diff --git a/AndroidBoot.mk b/AndroidBoot.mk
index 74a0ea1..832c472 100644
--- a/AndroidBoot.mk
+++ b/AndroidBoot.mk
@@ -19,7 +19,9 @@
 endif
 
 ifeq ($(TARGET_BUILD_VARIANT),user)
-	BUILD_VARIANT := USER_BUILD_VARIANT=true
+	USER_BUILD_VARIANT := USER_BUILD_VARIANT=1
+else
+	USER_BUILD_VARIANT := USER_BUILD_VARIANT=0
 endif
 
 # ABL ELF output
@@ -35,7 +37,7 @@
 
 # Top level target
 $(TARGET_ABL): abl_clean | $(ABL_OUT) $(INSTALLED_KEYSTOREIMAGE_TARGET)
-	$(MAKE) -C bootable/bootloader/edk2 BOOTLOADER_OUT=../../../$(ABL_OUT) all $(SIGNED_KERNEL) $(VERIFIED_BOOT) $(DEVICE_STATUS) $(BUILD_VARIANT) CLANG_BIN=$(CLANG_BIN)
+	$(MAKE) -C bootable/bootloader/edk2 BOOTLOADER_OUT=../../../$(ABL_OUT) all $(SIGNED_KERNEL) $(VERIFIED_BOOT) $(DEVICE_STATUS) $(USER_BUILD_VARIANT) CLANG_BIN=$(CLANG_BIN)
 
 .PHONY: abl