diff --git a/libwvdrmengine/Android.mk b/libwvdrmengine/Android.mk
index d5d3ee6a..2dbd7e71 100644
--- a/libwvdrmengine/Android.mk
+++ b/libwvdrmengine/Android.mk
@@ -32,7 +32,7 @@ LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR)/bin/hw
 LOCAL_PROPRIETARY_MODULE := true
 LOCAL_MODULE_OWNER := widevine
 
-ifneq ($(ENABLE_MEDIADRM_64), true)
+ifneq ($(TARGET_ENABLE_MEDIADRM_64), true)
 LOCAL_MODULE_TARGET_ARCH := arm x86 mips
 endif
 
diff --git a/libwvdrmengine/cdm/test/unit-test.mk b/libwvdrmengine/cdm/test/unit-test.mk
index b6bba23e..234fc8f8 100644
--- a/libwvdrmengine/cdm/test/unit-test.mk
+++ b/libwvdrmengine/cdm/test/unit-test.mk
@@ -54,7 +54,7 @@ LOCAL_MODULE_OWNER := widevine
 
 LOCAL_PROPRIETARY_MODULE := true
 
-ifneq ($(ENABLE_MEDIADRM_64), true)
+ifneq ($(TARGET_ENABLE_MEDIADRM_64), true)
 LOCAL_MODULE_TARGET_ARCH := arm x86 mips
 endif
 
diff --git a/libwvdrmengine/mediacrypto/test/Android.mk b/libwvdrmengine/mediacrypto/test/Android.mk
index f02e654a..2ed07a3f 100644
--- a/libwvdrmengine/mediacrypto/test/Android.mk
+++ b/libwvdrmengine/mediacrypto/test/Android.mk
@@ -48,7 +48,7 @@ LOCAL_MODULE_OWNER := widevine
 
 LOCAL_PROPRIETARY_MODULE := true
 
-ifneq ($(ENABLE_MEDIADRM_64), true)
+ifneq ($(TARGET_ENABLE_MEDIADRM_64), true)
 LOCAL_MODULE_TARGET_ARCH := arm x86 mips
 endif
 
@@ -113,7 +113,7 @@ LOCAL_MODULE_OWNER := widevine
 
 LOCAL_PROPRIETARY_MODULE := true
 
-ifneq ($(ENABLE_MEDIADRM_64), true)
+ifneq ($(TARGET_ENABLE_MEDIADRM_64), true)
 LOCAL_MODULE_TARGET_ARCH := arm x86 mips
 endif
 
diff --git a/libwvdrmengine/mediadrm/test/Android.mk b/libwvdrmengine/mediadrm/test/Android.mk
index bc71e346..a04a4281 100644
--- a/libwvdrmengine/mediadrm/test/Android.mk
+++ b/libwvdrmengine/mediadrm/test/Android.mk
@@ -48,7 +48,7 @@ LOCAL_MODULE_OWNER := widevine
 
 LOCAL_PROPRIETARY_MODULE := true
 
-ifneq ($(ENABLE_MEDIADRM_64), true)
+ifneq ($(TARGET_ENABLE_MEDIADRM_64), true)
 LOCAL_MODULE_TARGET_ARCH := arm x86 mips
 endif
 
@@ -114,7 +114,7 @@ LOCAL_MODULE_OWNER := widevine
 
 LOCAL_PROPRIETARY_MODULE := true
 
-ifneq ($(ENABLE_MEDIADRM_64), true)
+ifneq ($(TARGET_ENABLE_MEDIADRM_64), true)
 LOCAL_MODULE_TARGET_ARCH := arm x86 mips
 endif
 
diff --git a/libwvdrmengine/oemcrypto/test/Android.mk b/libwvdrmengine/oemcrypto/test/Android.mk
index 86fbaab8..2f78507d 100644
--- a/libwvdrmengine/oemcrypto/test/Android.mk
+++ b/libwvdrmengine/oemcrypto/test/Android.mk
@@ -9,7 +9,7 @@ LOCAL_MODULE_OWNER := widevine
 
 LOCAL_PROPRIETARY_MODULE := true
 
-ifneq ($(ENABLE_MEDIADRM_64), true)
+ifneq ($(TARGET_ENABLE_MEDIADRM_64), true)
 LOCAL_MODULE_TARGET_ARCH := arm x86 mips
 endif
 
diff --git a/libwvdrmengine/test/unit/Android.mk b/libwvdrmengine/test/unit/Android.mk
index 47f50056..439c8857 100644
--- a/libwvdrmengine/test/unit/Android.mk
+++ b/libwvdrmengine/test/unit/Android.mk
@@ -36,7 +36,7 @@ LOCAL_MODULE_OWNER := widevine
 
 LOCAL_PROPRIETARY_MODULE := true
 
-ifneq ($(ENABLE_MEDIADRM_64), true)
+ifneq ($(TARGET_ENABLE_MEDIADRM_64), true)
 LOCAL_MODULE_TARGET_ARCH := arm x86 mips
 endif
 
@@ -84,7 +84,7 @@ LOCAL_MODULE_OWNER := widevine
 
 LOCAL_PROPRIETARY_MODULE := true
 
-ifneq ($(ENABLE_MEDIADRM_64), true)
+ifneq ($(TARGET_ENABLE_MEDIADRM_64), true)
 LOCAL_MODULE_TARGET_ARCH := arm x86 mips
 endif