diff --git a/config/common.mk b/config/common.mk
index 85bf8831..8641dbd0 100644
--- a/config/common.mk
+++ b/config/common.mk
@@ -273,11 +273,12 @@ PRODUCT_ARTIFACT_PATH_REQUIREMENT_ALLOWED_LIST += \
     system/bin/procmem
 endif
 
+ifneq ($(TARGET_BUILD_VARIANT),user)
+ifeq ($(WITH_SU),true)
 # Root
 PRODUCT_PACKAGES += \
     adb_root
-ifneq ($(TARGET_BUILD_VARIANT),user)
-ifeq ($(WITH_SU),true)
+
 PRODUCT_PACKAGES += \
     su