diff --git a/Android.mk b/Android.mk
new file mode 100644
index 00000000..322f3dd5
--- /dev/null
+++ b/Android.mk
@@ -0,0 +1,3 @@
+WIDEVINE_SUPPORTED_ARCH := arm x86
+
+include $(call all-subdir-makefiles)
diff --git a/libwvdrmengine/Android.mk b/libwvdrmengine/Android.mk
index d5a3bd92..6f300174 100644
--- a/libwvdrmengine/Android.mk
+++ b/libwvdrmengine/Android.mk
@@ -112,12 +112,16 @@ LOCAL_ADDITIONAL_DEPENDENCIES := $(cdm_proto_gen_headers)
 
 LOCAL_MODULE := libwvdrmengine
 
-LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR_SHARED_LIBRARIES)/mediadrm
+LOCAL_MODULE_RELATIVE_PATH := mediadrm
 
 LOCAL_MODULE_TAGS := optional
 
 LOCAL_MODULE_OWNER := widevine
 
+LOCAL_PROPRIETARY_MODULE := true
+
+LOCAL_MODULE_TARGET_ARCH := arm mips x86
+
 include $(BUILD_SHARED_LIBRARY)
 
 include vendor/widevine/libwvdrmengine/cdm/Android.mk
diff --git a/libwvdrmengine/level3/Android.mk b/libwvdrmengine/level3/Android.mk
index d52c9716..83384322 100644
--- a/libwvdrmengine/level3/Android.mk
+++ b/libwvdrmengine/level3/Android.mk
@@ -1,4 +1,2 @@
-ifneq ($(filter arm x86 mips,$(TARGET_ARCH)),)
 include $(call all-subdir-makefiles)
-endif
 
diff --git a/libwvdrmengine/level3/arm/Android.mk b/libwvdrmengine/level3/arm/Android.mk
index 74264a75..d8176fcc 100644
--- a/libwvdrmengine/level3/arm/Android.mk
+++ b/libwvdrmengine/level3/arm/Android.mk
@@ -1,4 +1,3 @@
-ifeq ($(TARGET_ARCH),arm)
 LOCAL_PATH:= $(call my-dir)
 include $(CLEAR_VARS)
 LOCAL_MODULE := libwvlevel3
@@ -8,5 +7,5 @@ LOCAL_SRC_FILES := $(LOCAL_MODULE)$(LOCAL_MODULE_SUFFIX)
 LOCAL_PROPRIETARY_MODULE := true
 LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE_OWNER := widevine
+LOCAL_MODULE_TARGET_ARCH := arm
 include $(BUILD_PREBUILT)
-endif # if arm.
diff --git a/libwvdrmengine/level3/mips/Android.mk b/libwvdrmengine/level3/mips/Android.mk
index b1311058..3ffa9e38 100644
--- a/libwvdrmengine/level3/mips/Android.mk
+++ b/libwvdrmengine/level3/mips/Android.mk
@@ -1,4 +1,3 @@
-ifeq ($(TARGET_ARCH),mips)
 LOCAL_PATH:= $(call my-dir)
 include $(CLEAR_VARS)
 LOCAL_MODULE := libwvlevel3
@@ -8,5 +7,5 @@ LOCAL_SRC_FILES := $(LOCAL_MODULE)$(LOCAL_MODULE_SUFFIX)
 LOCAL_PROPRIETARY_MODULE := true
 LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE_OWNER := widevine
+LOCAL_MODULE_TARGET_ARCH := mips
 include $(BUILD_PREBUILT)
-endif # if mips.
diff --git a/libwvdrmengine/level3/x86/Android.mk b/libwvdrmengine/level3/x86/Android.mk
index 0f2a7792..37d3830c 100644
--- a/libwvdrmengine/level3/x86/Android.mk
+++ b/libwvdrmengine/level3/x86/Android.mk
@@ -1,4 +1,3 @@
-ifeq ($(TARGET_ARCH),x86)
 LOCAL_PATH:= $(call my-dir)
 include $(CLEAR_VARS)
 LOCAL_MODULE := libwvlevel3
@@ -8,5 +7,5 @@ LOCAL_SRC_FILES := $(LOCAL_MODULE)$(LOCAL_MODULE_SUFFIX)
 LOCAL_PROPRIETARY_MODULE := true
 LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE_OWNER := widevine
+LOCAL_MODULE_TARGET_ARCH := x86
 include $(BUILD_PREBUILT)
-endif # if x86.
diff --git a/proprietary/Android.mk b/proprietary/Android.mk
index 98ba166a..8d24b2f9 100644
--- a/proprietary/Android.mk
+++ b/proprietary/Android.mk
@@ -1,9 +1,7 @@
 # widevine prebuilts only available for ARM
 # To build this dir you must define BOARD_WIDEVINE_OEMCRYPTO_LEVEL in the board config.
 ifdef BOARD_WIDEVINE_OEMCRYPTO_LEVEL
-ifneq ($(filter arm x86,$(TARGET_ARCH)),)
 
 include $(call all-subdir-makefiles)
 
-endif # TARGET_ARCH == arm, x86
 endif # BOARD_WIDEVINE_OEMCRYPTO_LEVEL
diff --git a/proprietary/drmwvmplugin/Android.mk b/proprietary/drmwvmplugin/Android.mk
index 74e2d29e..c0c39d65 100644
--- a/proprietary/drmwvmplugin/Android.mk
+++ b/proprietary/drmwvmplugin/Android.mk
@@ -31,8 +31,6 @@ include $(BUILD_JAVA_LIBRARY)
 
 ########################
 
-ifneq ($(filter arm x86,$(TARGET_ARCH)),)
-
 include $(CLEAR_VARS)
 include $(TOP)/vendor/widevine/proprietary/drmwvmplugin/common.mk
 
@@ -43,9 +41,9 @@ LOCAL_SRC_FILES:= \
 LOCAL_MODULE := libdrmwvmcommon
 LOCAL_MODULE_TAGS := optional
 
+LOCAL_MODULE_TARGET_ARCH := $(WIDEVINE_SUPPORTED_ARCH)
+
 include $(BUILD_STATIC_LIBRARY)
 
 # invoke Android.mk files in subdirs
 include $(call all-makefiles-under,$(LOCAL_PATH))
-
-endif
diff --git a/proprietary/drmwvmplugin/common.mk b/proprietary/drmwvmplugin/common.mk
index ca35d211..1dd825c5 100644
--- a/proprietary/drmwvmplugin/common.mk
+++ b/proprietary/drmwvmplugin/common.mk
@@ -8,6 +8,4 @@ LOCAL_C_INCLUDES:= \
     $(TOP)/frameworks/av/drm/libdrmframework/plugins/common/include \
     $(TOP)/frameworks/av/include
 
-ifeq ($(TARGET_ARCH),x86)
-LOCAL_C_INCLUDES += $(TOP)/system/core/include/arch/linux-x86
-endif
+LOCAL_C_INCLUDES_x86 += $(TOP)/system/core/include/arch/linux-x86
diff --git a/proprietary/drmwvmplugin/lib/Android.mk b/proprietary/drmwvmplugin/lib/Android.mk
index 8a9c12a2..5053e7d6 100644
--- a/proprietary/drmwvmplugin/lib/Android.mk
+++ b/proprietary/drmwvmplugin/lib/Android.mk
@@ -1,5 +1 @@
-ifneq ($(filter arm x86,$(TARGET_ARCH)),)
-
 include $(call all-subdir-makefiles)
-
-endif
diff --git a/proprietary/drmwvmplugin/lib/arm/Android.mk b/proprietary/drmwvmplugin/lib/arm/Android.mk
index 11760361..832e695c 100644
--- a/proprietary/drmwvmplugin/lib/arm/Android.mk
+++ b/proprietary/drmwvmplugin/lib/arm/Android.mk
@@ -1,5 +1,3 @@
-ifeq ($(TARGET_ARCH),arm)
-
 LOCAL_PATH:= $(call my-dir)
 
 ifneq ($(BOARD_USES_GENERIC_WIDEVINE),false)
@@ -18,6 +16,7 @@ LOCAL_STRIP_MODULE := true
 
 LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE_OWNER := widevine
+LOCAL_MODULE_TARGET_ARCH := arm
 include $(BUILD_PREBUILT)
 
 #########################################################################
@@ -31,8 +30,8 @@ LOCAL_MODULE_SUFFIX := .a
 LOCAL_SRC_FILES := $(LOCAL_MODULE)$(LOCAL_MODULE_SUFFIX)
 
 LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_TARGET_ARCH := arm
 include $(BUILD_PREBUILT)
 
 endif
 
-endif
diff --git a/proprietary/drmwvmplugin/lib/x86/Android.mk b/proprietary/drmwvmplugin/lib/x86/Android.mk
index 0f189800..1146b79d 100644
--- a/proprietary/drmwvmplugin/lib/x86/Android.mk
+++ b/proprietary/drmwvmplugin/lib/x86/Android.mk
@@ -1,5 +1,3 @@
-ifeq ($(TARGET_ARCH),x86)
-
 LOCAL_PATH:= $(call my-dir)
 
 #########################################################################
@@ -15,6 +13,7 @@ LOCAL_PROPRIETARY_MODULE := true
 LOCAL_STRIP_MODULE := true
 
 LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_TARGET_ARCH := x86
 include $(BUILD_PREBUILT)
 
 #########################################################################
@@ -28,6 +27,5 @@ LOCAL_MODULE_SUFFIX := .a
 LOCAL_SRC_FILES := $(LOCAL_MODULE)$(LOCAL_MODULE_SUFFIX)
 
 LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_TARGET_ARCH := x86
 include $(BUILD_PREBUILT)
-
-endif
diff --git a/proprietary/drmwvmplugin/test/Android.mk b/proprietary/drmwvmplugin/test/Android.mk
index 1e1e1285..9405f86e 100644
--- a/proprietary/drmwvmplugin/test/Android.mk
+++ b/proprietary/drmwvmplugin/test/Android.mk
@@ -1,5 +1,3 @@
-ifneq ($(filter arm x86,$(TARGET_ARCH)),)
-
 LOCAL_PATH:= $(call my-dir)
 include $(CLEAR_VARS)
 
@@ -16,9 +14,7 @@ LOCAL_C_INCLUDES+= \
     frameworks/av/drm/libdrmframework/include \
     frameworks/av/drm/libdrmframework/plugins/common/include
 
-ifeq ($(TARGET_ARCH),x86)
-LOCAL_C_INCLUDES += $(TOP)/system/core/include/arch/linux-x86
-endif
+LOCAL_C_INCLUDES_x86 += $(TOP)/system/core/include/arch/linux-x86
 
 LOCAL_SHARED_LIBRARIES := \
     libstlport            \
@@ -34,6 +30,6 @@ LOCAL_MODULE:=test-wvdrmplugin
 
 LOCAL_MODULE_TAGS := tests
 
-include $(BUILD_EXECUTABLE)
+LOCAL_MODULE_TARGET_ARCH := $(WIDEVINE_SUPPORTED_ARCH)
 
-endif
+include $(BUILD_EXECUTABLE)
diff --git a/proprietary/streamcontrol/lib/Android.mk b/proprietary/streamcontrol/lib/Android.mk
index 8a9c12a2..5053e7d6 100644
--- a/proprietary/streamcontrol/lib/Android.mk
+++ b/proprietary/streamcontrol/lib/Android.mk
@@ -1,5 +1 @@
-ifneq ($(filter arm x86,$(TARGET_ARCH)),)
-
 include $(call all-subdir-makefiles)
-
-endif
diff --git a/proprietary/streamcontrol/lib/arm/Android.mk b/proprietary/streamcontrol/lib/arm/Android.mk
index 3004455a..e7ae6c4f 100644
--- a/proprietary/streamcontrol/lib/arm/Android.mk
+++ b/proprietary/streamcontrol/lib/arm/Android.mk
@@ -1,5 +1,3 @@
-ifeq ($(TARGET_ARCH),arm)
-
 LOCAL_PATH:= $(call my-dir)
 
 ifneq ($(BOARD_USES_GENERIC_WIDEVINE),false)
@@ -15,8 +13,7 @@ LOCAL_STRIP_MODULE := true
 
 LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE_OWNER := widevine
+LOCAL_MODULE_TARGET_ARCH := arm
 include $(BUILD_PREBUILT)
 
 endif
-
-endif
diff --git a/proprietary/streamcontrol/lib/x86/Android.mk b/proprietary/streamcontrol/lib/x86/Android.mk
index ebc5deeb..9e8f4631 100644
--- a/proprietary/streamcontrol/lib/x86/Android.mk
+++ b/proprietary/streamcontrol/lib/x86/Android.mk
@@ -1,5 +1,3 @@
-ifeq ($(TARGET_ARCH),x86)
-
 LOCAL_PATH:= $(call my-dir)
 
 include $(CLEAR_VARS)
@@ -12,6 +10,5 @@ LOCAL_PROPRIETARY_MODULE := true
 LOCAL_STRIP_MODULE := true
 
 LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_TARGET_ARCH := x86
 include $(BUILD_PREBUILT)
-
-endif
diff --git a/proprietary/streamcontrol/test/Android.mk b/proprietary/streamcontrol/test/Android.mk
index 082be797..5f11dafd 100644
--- a/proprietary/streamcontrol/test/Android.mk
+++ b/proprietary/streamcontrol/test/Android.mk
@@ -1,5 +1,3 @@
-ifneq ($(filter arm x86,$(TARGET_ARCH)),)
-
 LOCAL_PATH:= $(call my-dir)
 
 include $(CLEAR_VARS)
@@ -18,9 +16,7 @@ LOCAL_C_INCLUDES += \
     frameworks/av/drm/libdrmframework/include \
     frameworks/av/drm/libdrmframework/plugins/common/include
 
-ifeq ($(TARGET_ARCH),x86)
-LOCAL_C_INCLUDES += $(TOP)/system/core/include/arch/linux-x86
-endif
+LOCAL_C_INCLUDES_x86 += $(TOP)/system/core/include/arch/linux-x86
 
 LOCAL_SHARED_LIBRARIES := \
     libstlport \
@@ -35,6 +31,6 @@ LOCAL_SHARED_LIBRARIES := \
 
 LOCAL_MODULE:=test-wvplayer_L$(BOARD_WIDEVINE_OEMCRYPTO_LEVEL)
 
-include $(BUILD_EXECUTABLE)
+LOCAL_MODULE_TARGET_ARCH := $(WIDEVINE_SUPPORTED_ARCH)
 
-endif
+include $(BUILD_EXECUTABLE)
diff --git a/proprietary/wvm/Android.mk b/proprietary/wvm/Android.mk
index a19d1d73..5c5331a4 100644
--- a/proprietary/wvm/Android.mk
+++ b/proprietary/wvm/Android.mk
@@ -1,5 +1,3 @@
-ifneq ($(filter arm x86,$(TARGET_ARCH)),)
-
 LOCAL_PATH := $(call my-dir)
 
 include $(CLEAR_VARS)
@@ -22,7 +20,5 @@ LOCAL_SHARED_LIBRARIES := \
 
 LOCAL_MODULE := libwvmcommon
 LOCAL_MODULE_TAGS := optional
-
+LOCAL_MODULE_TARGET_ARCH := $(WIDEVINE_SUPPORTED_ARCH)
 include $(BUILD_STATIC_LIBRARY)
-
-endif
diff --git a/proprietary/wvm/common.mk b/proprietary/wvm/common.mk
index a8517655..c1dba28c 100644
--- a/proprietary/wvm/common.mk
+++ b/proprietary/wvm/common.mk
@@ -6,6 +6,4 @@ LOCAL_C_INCLUDES:=                      \
     vendor/widevine/proprietary/streamcontrol/include \
     vendor/widevine/proprietary/wvm/include
 
-ifeq ($(TARGET_ARCH),x86)
-LOCAL_C_INCLUDES += $(TOP)/system/core/include/arch/linux-x86
-endif
+LOCAL_C_INCLUDES_x86 += $(TOP)/system/core/include/arch/linux-x86
diff --git a/proprietary/wvm/test/Android.mk b/proprietary/wvm/test/Android.mk
index aa15b53c..bae1bf2e 100644
--- a/proprietary/wvm/test/Android.mk
+++ b/proprietary/wvm/test/Android.mk
@@ -1,5 +1,3 @@
-ifneq ($(filter arm x86,$(TARGET_ARCH)),)
-
 LOCAL_PATH:= $(call my-dir)
 
 include $(CLEAR_VARS)
@@ -13,9 +11,7 @@ LOCAL_C_INCLUDES+=                      \
     external/stlport/stlport            \
     frameworks/av/media/libstagefright
 
-ifeq ($(TARGET_ARCH),x86)
-LOCAL_C_INCLUDES += $(TOP)/system/core/include/arch/linux-x86
-endif
+LOCAL_C_INCLUDES_x86 += $(TOP)/system/core/include/arch/linux-x86
 
 LOCAL_SHARED_LIBRARIES := \
     libstlport            \
@@ -30,6 +26,6 @@ LOCAL_MODULE:=test-libwvm
 
 LOCAL_MODULE_TAGS := tests
 
-include $(BUILD_EXECUTABLE)
+LOCAL_MODULE_TARGET_ARCH := $(WIDEVINE_SUPPORTED_ARCH)
 
-endif
+include $(BUILD_EXECUTABLE)
diff --git a/proprietary/wvm/wvm-core.mk b/proprietary/wvm/wvm-core.mk
index f8847053..a3a5ba1e 100644
--- a/proprietary/wvm/wvm-core.mk
+++ b/proprietary/wvm/wvm-core.mk
@@ -22,6 +22,4 @@ LOCAL_SHARED_LIBRARIES := \
     libutils \
     libz
 
-ifeq ($(TARGET_ARCH),x86)
-LOCAL_SHARED_LIBRARIES += libdl
-endif
+LOCAL_SHARED_LIBRARIES_x86 += libdl