widevine-partner/android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use board config variable BOARD_WIDEVINE_OEMCRYPTO_LEVEL

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

Change-Id: I1ac5b8ace25dd4798d3383304f01496f12193526
This commit is contained in:
Ying Wang
2012-06-05 14:29:27 -07:00
parent e01879128b
commit e36b59b8d3
17 changed files with 50 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
proprietary/streamcontrol/lib/arm/Android.mk
View File

@@ -5,9 +5,8 @@ LOCAL_PATH:= $(call my-dir)
ifneq ($(BOARD_USES_GENERIC_WIDEVINE),false)
include $(CLEAR_VARS)
include $(TOP)/vendor/widevine/proprietary/drmwvmplugin/oemcryptolevel.mk
LOCAL_MODULE := libWVStreamControlAPI_L$(LOCAL_OEMCRYPTO_LEVEL)
LOCAL_MODULE := libWVStreamControlAPI_L$(BOARD_WIDEVINE_OEMCRYPTO_LEVEL)
LOCAL_MODULE_CLASS := SHARED_LIBRARIES
LOCAL_MODULE_SUFFIX := .so
LOCAL_SRC_FILES := $(LOCAL_MODULE)$(LOCAL_MODULE_SUFFIX)

3
proprietary/streamcontrol/lib/x86/Android.mk
View File

@@ -3,9 +3,8 @@ ifeq ($(TARGET_ARCH),x86)
LOCAL_PATH:= $(call my-dir)
include $(CLEAR_VARS)
include $(TOP)/vendor/widevine/proprietary/drmwvmplugin/oemcryptolevel.mk
LOCAL_MODULE := libWVStreamControlAPI_L$(LOCAL_OEMCRYPTO_LEVEL)
LOCAL_MODULE := libWVStreamControlAPI_L$(BOARD_WIDEVINE_OEMCRYPTO_LEVEL)
LOCAL_MODULE_CLASS := SHARED_LIBRARIES
LOCAL_MODULE_SUFFIX := .so
LOCAL_SRC_FILES := $(LOCAL_MODULE)$(LOCAL_MODULE_SUFFIX)

9
proprietary/streamcontrol/test/Android.mk
View File

@@ -3,7 +3,6 @@ ifneq ($(filter arm x86,$(TARGET_ARCH)),)
LOCAL_PATH:= $(call my-dir)
include $(CLEAR_VARS)
include $(TOP)/vendor/widevine/proprietary/drmwvmplugin/oemcryptolevel.mk
LOCAL_SRC_FILES:= \
TestPlayer.cpp
@@ -20,7 +19,7 @@ LOCAL_C_INCLUDES += \
frameworks/av/drm/libdrmframework/plugins/common/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
LOCAL_SHARED_LIBRARIES := \
@@ -31,10 +30,10 @@ LOCAL_SHARED_LIBRARIES := \
libz \
libcutils \
libdl \
libWVStreamControlAPI_L$(LOCAL_OEMCRYPTO_LEVEL) \
libwvdrm_L$(LOCAL_OEMCRYPTO_LEVEL)
libWVStreamControlAPI_L$(BOARD_WIDEVINE_OEMCRYPTO_LEVEL) \
libwvdrm_L$(BOARD_WIDEVINE_OEMCRYPTO_LEVEL)
LOCAL_MODULE:=test-wvplayer_L$(LOCAL_OEMCRYPTO_LEVEL)
LOCAL_MODULE:=test-wvplayer_L$(BOARD_WIDEVINE_OEMCRYPTO_LEVEL)
include $(BUILD_EXECUTABLE)