diff --git a/libwvdrmengine/Android.mk b/libwvdrmengine/Android.mk
index bf289115..f40166ed 100644
--- a/libwvdrmengine/Android.mk
+++ b/libwvdrmengine/Android.mk
@@ -30,7 +30,9 @@ LOCAL_INIT_RC := src_hidl/android.hardware.drm@1.0-service.widevine.rc
 LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR)/bin/hw
 LOCAL_PROPRIETARY_MODULE := true
 
+ifneq ($(ENABLE_MEDIADRM_64), true)
 LOCAL_MODULE_TARGET_ARCH := arm x86 mips
+endif
 
 include $(BUILD_EXECUTABLE)
 
diff --git a/libwvdrmengine/cdm/test/unit-test.mk b/libwvdrmengine/cdm/test/unit-test.mk
index d5abfc69..b6bba23e 100644
--- a/libwvdrmengine/cdm/test/unit-test.mk
+++ b/libwvdrmengine/cdm/test/unit-test.mk
@@ -54,6 +54,8 @@ LOCAL_MODULE_OWNER := widevine
 
 LOCAL_PROPRIETARY_MODULE := true
 
+ifneq ($(ENABLE_MEDIADRM_64), true)
 LOCAL_MODULE_TARGET_ARCH := arm x86 mips
+endif
 
 include $(BUILD_EXECUTABLE)
diff --git a/libwvdrmengine/mediacrypto/test/Android.mk b/libwvdrmengine/mediacrypto/test/Android.mk
index 3fbf53d1..6bd6624e 100644
--- a/libwvdrmengine/mediacrypto/test/Android.mk
+++ b/libwvdrmengine/mediacrypto/test/Android.mk
@@ -49,7 +49,9 @@ LOCAL_MODULE_OWNER := widevine
 
 LOCAL_PROPRIETARY_MODULE := true
 
+ifneq ($(ENABLE_MEDIADRM_64), true)
 LOCAL_MODULE_TARGET_ARCH := arm x86 mips
+endif
 
 include $(BUILD_EXECUTABLE)
 
@@ -114,6 +116,8 @@ LOCAL_MODULE_OWNER := widevine
 
 LOCAL_PROPRIETARY_MODULE := true
 
+ifneq ($(ENABLE_MEDIADRM_64), true)
 LOCAL_MODULE_TARGET_ARCH := arm x86 mips
+endif
 
 include $(BUILD_EXECUTABLE)
diff --git a/libwvdrmengine/mediadrm/test/Android.mk b/libwvdrmengine/mediadrm/test/Android.mk
index 8fdaca28..89500ce1 100644
--- a/libwvdrmengine/mediadrm/test/Android.mk
+++ b/libwvdrmengine/mediadrm/test/Android.mk
@@ -50,7 +50,9 @@ LOCAL_MODULE_OWNER := widevine
 
 LOCAL_PROPRIETARY_MODULE := true
 
+ifneq ($(ENABLE_MEDIADRM_64), true)
 LOCAL_MODULE_TARGET_ARCH := arm x86 mips
+endif
 
 include $(BUILD_EXECUTABLE)
 
@@ -116,6 +118,8 @@ LOCAL_MODULE_OWNER := widevine
 
 LOCAL_PROPRIETARY_MODULE := true
 
+ifneq ($(ENABLE_MEDIADRM_64), true)
 LOCAL_MODULE_TARGET_ARCH := arm x86 mips
+endif
 
 include $(BUILD_EXECUTABLE)
diff --git a/libwvdrmengine/oemcrypto/test/Android.mk b/libwvdrmengine/oemcrypto/test/Android.mk
index 20ef7c34..86fbaab8 100644
--- a/libwvdrmengine/oemcrypto/test/Android.mk
+++ b/libwvdrmengine/oemcrypto/test/Android.mk
@@ -9,7 +9,9 @@ LOCAL_MODULE_OWNER := widevine
 
 LOCAL_PROPRIETARY_MODULE := true
 
+ifneq ($(ENABLE_MEDIADRM_64), true)
 LOCAL_MODULE_TARGET_ARCH := arm x86 mips
+endif
 
 include $(LOCAL_PATH)/common.mk
 
diff --git a/libwvdrmengine/test/unit/Android.mk b/libwvdrmengine/test/unit/Android.mk
index 635d68bc..2fe17374 100644
--- a/libwvdrmengine/test/unit/Android.mk
+++ b/libwvdrmengine/test/unit/Android.mk
@@ -38,7 +38,9 @@ LOCAL_MODULE_OWNER := widevine
 
 LOCAL_PROPRIETARY_MODULE := true
 
+ifneq ($(ENABLE_MEDIADRM_64), true)
 LOCAL_MODULE_TARGET_ARCH := arm x86 mips
+endif
 
 include $(BUILD_EXECUTABLE)
 
@@ -85,6 +87,8 @@ LOCAL_MODULE_OWNER := widevine
 
 LOCAL_PROPRIETARY_MODULE := true
 
+ifneq ($(ENABLE_MEDIADRM_64), true)
 LOCAL_MODULE_TARGET_ARCH := arm x86 mips
+endif
 
 include $(BUILD_EXECUTABLE)