[WVDRM] Reorg of binary libs into proc-specific folders

Rahul's changes in preparation for adding x86 support

Change-Id: Ib51dfa72291857c44be37595be2205dd040fc0dd
related-to-bug: 6276794

proprietary/drmwvmplugin/Android.mk

@@ -31,7 +31,7 @@ include $(BUILD_JAVA_LIBRARY)
 
 ########################
 
-ifeq ($(TARGET_ARCH),arm)
+ifneq ($(filter arm x86,$(TARGET_ARCH)),)
 
 include $(CLEAR_VARS)
 include $(TOP)/vendor/widevine/proprietary/drmwvmplugin/common.mk

proprietary/drmwvmplugin/common.mk

@@ -7,3 +7,7 @@ LOCAL_C_INCLUDES:= \
     $(TOP)/frameworks/av/drm/libdrmframework/include \
     $(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

proprietary/drmwvmplugin/lib/Android.mk

@@ -1,35 +1,5 @@
-ifeq ($(TARGET_ARCH),arm)
+ifneq ($(filter arm x86,$(TARGET_ARCH)),)
 
-LOCAL_PATH:= $(call my-dir)
-
-#########################################################################
-# libwvdrm_L?.so
-
-include $(CLEAR_VARS)
-include $(TOP)/vendor/widevine/proprietary/drmwvmplugin/oemcryptolevel.mk
-
-LOCAL_MODULE := libwvdrm_L$(LOCAL_OEMCRYPTO_LEVEL)
-LOCAL_MODULE_CLASS := SHARED_LIBRARIES
-LOCAL_MODULE_SUFFIX := .so
-LOCAL_SRC_FILES := $(LOCAL_MODULE)$(LOCAL_MODULE_SUFFIX)
-LOCAL_PROPRIETARY_MODULE := true
-LOCAL_STRIP_MODULE := true
-
-LOCAL_MODULE_TAGS := optional
-include $(BUILD_PREBUILT)
-
-#########################################################################
-# libwvocs_L?.a
-
-include $(CLEAR_VARS)
-include $(TOP)/vendor/widevine/proprietary/drmwvmplugin/oemcryptolevel.mk
-
-LOCAL_MODULE := libwvocs_L$(LOCAL_OEMCRYPTO_LEVEL)
-LOCAL_MODULE_CLASS := STATIC_LIBRARIES
-LOCAL_MODULE_SUFFIX := .a
-LOCAL_SRC_FILES := $(LOCAL_MODULE)$(LOCAL_MODULE_SUFFIX)
-
-LOCAL_MODULE_TAGS := optional
-include $(BUILD_PREBUILT)
+include $(call all-subdir-makefiles)
 
 endif

proprietary/drmwvmplugin/lib/arm/Android.mk

@@ -0,0 +1,35 @@
+ifeq ($(TARGET_ARCH),arm)
+
+LOCAL_PATH:= $(call my-dir)
+
+#########################################################################
+# libwvdrm_L?.so
+
+include $(CLEAR_VARS)
+include $(TOP)/vendor/widevine/proprietary/drmwvmplugin/oemcryptolevel.mk
+
+LOCAL_MODULE := libwvdrm_L$(LOCAL_OEMCRYPTO_LEVEL)
+LOCAL_MODULE_CLASS := SHARED_LIBRARIES
+LOCAL_MODULE_SUFFIX := .so
+LOCAL_SRC_FILES := $(LOCAL_MODULE)$(LOCAL_MODULE_SUFFIX)
+LOCAL_PROPRIETARY_MODULE := true
+LOCAL_STRIP_MODULE := true
+
+LOCAL_MODULE_TAGS := optional
+include $(BUILD_PREBUILT)
+
+#########################################################################
+# libwvocs_L?.a
+
+include $(CLEAR_VARS)
+include $(TOP)/vendor/widevine/proprietary/drmwvmplugin/oemcryptolevel.mk
+
+LOCAL_MODULE := libwvocs_L$(LOCAL_OEMCRYPTO_LEVEL)
+LOCAL_MODULE_CLASS := STATIC_LIBRARIES
+LOCAL_MODULE_SUFFIX := .a
+LOCAL_SRC_FILES := $(LOCAL_MODULE)$(LOCAL_MODULE_SUFFIX)
+
+LOCAL_MODULE_TAGS := optional
+include $(BUILD_PREBUILT)
+
+endif

proprietary/drmwvmplugin/lib/x86/Android.mk

@@ -0,0 +1,35 @@
+ifeq ($(TARGET_ARCH),x86)
+
+LOCAL_PATH:= $(call my-dir)
+
+#########################################################################
+# libwvdrm_L?.so
+
+include $(CLEAR_VARS)
+include $(TOP)/vendor/widevine/proprietary/drmwvmplugin/oemcryptolevel.mk
+
+LOCAL_MODULE := libwvdrm_L$(LOCAL_OEMCRYPTO_LEVEL)
+LOCAL_MODULE_CLASS := SHARED_LIBRARIES
+LOCAL_MODULE_SUFFIX := .so
+LOCAL_SRC_FILES := $(LOCAL_MODULE)$(LOCAL_MODULE_SUFFIX)
+LOCAL_PROPRIETARY_MODULE := true
+LOCAL_STRIP_MODULE := true
+
+LOCAL_MODULE_TAGS := optional
+include $(BUILD_PREBUILT)
+
+#########################################################################
+# libwvocs_L?.a
+
+include $(CLEAR_VARS)
+include $(TOP)/vendor/widevine/proprietary/drmwvmplugin/oemcryptolevel.mk
+
+LOCAL_MODULE := libwvocs_L$(LOCAL_OEMCRYPTO_LEVEL)
+LOCAL_MODULE_CLASS := STATIC_LIBRARIES
+LOCAL_MODULE_SUFFIX := .a
+LOCAL_SRC_FILES := $(LOCAL_MODULE)$(LOCAL_MODULE_SUFFIX)
+
+LOCAL_MODULE_TAGS := optional
+include $(BUILD_PREBUILT)
+
+endif

proprietary/drmwvmplugin/test/Android.mk

@@ -1,4 +1,4 @@
-ifeq ($(TARGET_ARCH),arm)
+ifneq ($(filter arm x86,$(TARGET_ARCH)),)
 
 LOCAL_PATH:= $(call my-dir)
 include $(CLEAR_VARS)
@@ -16,6 +16,10 @@ 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_SHARED_LIBRARIES := \
     libstlport            \
     liblog                \