Use board config variable BOARD_WIDEVINE_OEMCRYPTO_LEVEL

Instead of grepping out the oemcrypto level from PRODUCT_PACKAGES, which
is very fragile.

Change-Id: I1ac5b8ace25dd4798d3383304f01496f12193526

proprietary/wvm/Android.mk

@@ -3,10 +3,9 @@ ifneq ($(filter arm x86,$(TARGET_ARCH)),)
 LOCAL_PATH := $(call my-dir)
 
 include $(CLEAR_VARS)
-include $(TOP)/vendor/widevine/proprietary/wvm/common.mk
-include $(TOP)/vendor/widevine/proprietary/drmwvmplugin/oemcryptolevel.mk
+include vendor/widevine/proprietary/wvm/common.mk
 
-ifeq ($(LOCAL_OEMCRYPTO_LEVEL),1)
+ifeq ($(BOARD_WIDEVINE_OEMCRYPTO_LEVEL),1)
 LOCAL_CFLAGS := -DREQUIRE_SECURE_BUFFERS
 endif
 

proprietary/wvm/common.mk

@@ -7,5 +7,5 @@ LOCAL_C_INCLUDES:=                      \
     vendor/widevine/proprietary/wvm/include
 
 ifeq ($(TARGET_ARCH),x86)
-LOCAL_C_INCLUDES += $(TOP)/system/core/include/arch/linux-x86
+LOCAL_C_INCLUDES += system/core/include/arch/linux-x86
 endif

proprietary/wvm/test/Android.mk

@@ -14,7 +14,7 @@ LOCAL_C_INCLUDES+=                      \
     frameworks/av/media/libstagefright
 
 ifeq ($(TARGET_ARCH),x86)
-LOCAL_C_INCLUDES += $(TOP)/system/core/include/arch/linux-x86
+LOCAL_C_INCLUDES += system/core/include/arch/linux-x86
 endif
 
 LOCAL_SHARED_LIBRARIES := \

proprietary/wvm/wvm-core.mk

@@ -3,8 +3,11 @@
 #  Widevine wvm static library.  Sets up includes and defines the core libraries
 #  required.
 #
-include $(TOP)/vendor/widevine/proprietary/wvm/common.mk
-include $(TOP)/vendor/widevine/proprietary/drmwvmplugin/oemcryptolevel.mk
+include vendor/widevine/proprietary/wvm/common.mk
+
+ifndef BOARD_WIDEVINE_OEMCRYPTO_LEVEL
+$(error BOARD_WIDEVINE_OEMCRYPTO_LEVEL not defined!)
+endif
 
 LOCAL_WHOLE_STATIC_LIBRARIES := \
     libwvmcommon
@@ -12,7 +15,7 @@ LOCAL_WHOLE_STATIC_LIBRARIES := \
 LOCAL_SHARED_LIBRARIES := \
     libstlport \
     libstagefright \
-    libWVStreamControlAPI_L$(LOCAL_OEMCRYPTO_LEVEL) \
+    libWVStreamControlAPI_L$(BOARD_WIDEVINE_OEMCRYPTO_LEVEL) \
     libdrmframework \
     libcutils \
     liblog \