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

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

Browse Source 
Rahul's changes in preparation for adding x86 support

Change-Id: Ib51dfa72291857c44be37595be2205dd040fc0dd
related-to-bug: 6276794
This commit is contained in:
Jeff Tinker
2012-04-10 17:24:41 -07:00
parent 9a7a7879f1
commit 300d172ba4
21 changed files with 139 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
proprietary/wvm/Android.mk
View File

@@ -1,4 +1,4 @@
ifeq ($(TARGET_ARCH),arm)
ifneq ($(filter arm x86,$(TARGET_ARCH)),)
LOCAL_PATH := $(call my-dir)

3
proprietary/wvm/common.mk
View File

@@ -6,3 +6,6 @@ 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

6
proprietary/wvm/test/Android.mk
View File

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

3
proprietary/wvm/wvm-core.mk
View File

@@ -19,3 +19,6 @@ LOCAL_SHARED_LIBRARIES := \
libutils \
libz
ifeq ($(TARGET_ARCH),x86)
LOCAL_SHARED_LIBRARIES += libdl
endif