diff --git a/core/board_config.mk b/core/board_config.mk
index bfce087f85..dcfed9d958 100644
--- a/core/board_config.mk
+++ b/core/board_config.mk
@@ -454,7 +454,7 @@ else ifdef BOARD_USES_ODMIMAGE
 endif
 
 BUILDING_ODM_IMAGE :=
-ifeq ($(ODM_BUILD_ODM_IMAGE),)
+ifeq ($(PRODUCT_BUILD_ODM_IMAGE),)
   ifdef BOARD_ODMIMAGE_FILE_SYSTEM_TYPE
     BUILDING_ODM_IMAGE := true
   endif