diff --git a/libadb/Android.mk b/libadb/Android.mk
index b13a3359..c37248bb 100644
--- a/libadb/Android.mk
+++ b/libadb/Android.mk
@@ -4,6 +4,11 @@ include $(CLEAR_VARS)
 
 LOCAL_MODULE := libadb-$(TARGET_BUILD_VARIANT)
 LOCAL_CFLAGS := $(KERNELFLINGER_CFLAGS)
+
+ifeq ($(KERNELFLINGER_XDCI_DISABLED),true)
+    LOCAL_CFLAGS += -DKERNELFLINGER_XDCI_DISABLED
+endif
+
 LOCAL_STATIC_LIBRARIES := \
 	$(KERNELFLINGER_STATIC_LIBRARIES) \
 	libefiusb-$(TARGET_BUILD_VARIANT) \
diff --git a/libadb/adb.c b/libadb/adb.c
index 8f1a06a7..3f2df9a3 100644
--- a/libadb/adb.c
+++ b/libadb/adb.c
@@ -386,6 +386,7 @@ static EFI_STATUS adb_tcp_start(start_callback_t start_cb,
 }
 
 static transport_t ADB_TRANSPORT[] = {
+#ifndef KERNELFLINGER_XDCI_DISABLED
 	{
 		.name = "USB for adb",
 		.start = adb_usb_start,
@@ -394,6 +395,7 @@ static transport_t ADB_TRANSPORT[] = {
 		.read = usb_read,
 		.write = usb_write
 	},
+#endif
 	{
 		.name = "TCP for adb",
 		.start = adb_tcp_start,
diff --git a/libfastboot/Android.mk b/libfastboot/Android.mk
index 365abba2..70fc9952 100644
--- a/libfastboot/Android.mk
+++ b/libfastboot/Android.mk
@@ -5,6 +5,10 @@ SHARED_CFLAGS := \
 	$(KERNELFLINGER_CFLAGS) \
 	-DTARGET_BOOTLOADER_BOARD_NAME=\"$(TARGET_BOOTLOADER_BOARD_NAME)\"
 
+ifeq ($(KERNELFLINGER_XDCI_DISABLED),true)
+    SHARED_CFLAGS += -DKERNELFLINGER_XDCI_DISABLED
+endif
+
 SHARED_C_INCLUDES := $(LOCAL_PATH)/../include \
                      $(KERNELFLINGER_LOCAL_PATH)/avb
 SHARED_STATIC_LIBRARIES := \
diff --git a/libfastboot/fastboot_transport.c b/libfastboot/fastboot_transport.c
index feb96458..509ded8e 100644
--- a/libfastboot/fastboot_transport.c
+++ b/libfastboot/fastboot_transport.c
@@ -250,6 +250,7 @@ EFI_STATUS fastboot_tcp_read(void *buf, UINT32 size)
 
 /* Transport */
 static transport_t FASTBOOT_TRANSPORT[] = {
+#ifndef KERNELFLINGER_XDCI_DISABLED
 	{
 		.name = "USB for fastboot",
 		.start = fastboot_usb_start,
@@ -258,6 +259,7 @@ static transport_t FASTBOOT_TRANSPORT[] = {
 		.read = fastboot_usb_read,
 		.write = usb_write
 	},
+#endif
 	{
 		.name = "TCP for fastboot",
 		.start = fastboot_tcp_start,