widevine: support multilib builds

Support builds for multiple architectures the same time:
Use LOCAL_MODULE_TARGET_ARCH to restrict building to specific arches
Use LOCAL_C_INCLUDES_x86 to set the include path for only x86 builds

Change-Id: I7c33c27f1c9bfb6e3318a07514698992482f6cd7

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

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

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)

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