diff --git a/aosp_redfin.mk b/aosp_redfin.mk
index 6844c9f..a36607c 100644
--- a/aosp_redfin.mk
+++ b/aosp_redfin.mk
@@ -17,7 +17,11 @@
 #
 # All components inherited here go to system image
 #
+ifeq (,$(filter %_64,$(TARGET_PRODUCT)))
 $(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk)
+else
+$(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit_only.mk)
+endif
 $(call inherit-product, $(SRC_TARGET_DIR)/product/generic_system.mk)
 
 # Enable mainline checking