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

4
proprietary/Android.mk
View File

@@ -1,6 +1,6 @@
# widevine prebuilts only available for ARM
ifeq ($(TARGET_ARCH),arm)
ifneq ($(filter arm x86,$(TARGET_ARCH)),)
include $(call all-subdir-makefiles)
endif # TARGET_ARCH == arm
endif # TARGET_ARCH == arm, x86

2
proprietary/drmwvmplugin/Android.mk
View File

@@ -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

4
proprietary/drmwvmplugin/common.mk
View File

@@ -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

34
proprietary/drmwvmplugin/lib/Android.mk
View File

@@ -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

35
proprietary/drmwvmplugin/lib/arm/Android.mk Normal file
View File

@@ -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

0
proprietary/drmwvmplugin/lib/libwvdrm_L1.so → proprietary/drmwvmplugin/lib/arm/libwvdrm_L1.so
View File

0
proprietary/drmwvmplugin/lib/libwvdrm_L3.so → proprietary/drmwvmplugin/lib/arm/libwvdrm_L3.so
View File

0
proprietary/drmwvmplugin/lib/libwvocs_L1.a → proprietary/drmwvmplugin/lib/arm/libwvocs_L1.a
View File

0
proprietary/drmwvmplugin/lib/libwvocs_L3.a → proprietary/drmwvmplugin/lib/arm/libwvocs_L3.a
View File

35
proprietary/drmwvmplugin/lib/x86/Android.mk Normal file
View File

@@ -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

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

@@ -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 \

17
proprietary/streamcontrol/lib/Android.mk
View File

@@ -1,18 +1,5 @@
ifeq ($(TARGET_ARCH),arm)
ifneq ($(filter arm x86,$(TARGET_ARCH)),)
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_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)
include $(call all-subdir-makefiles)
endif

18
proprietary/streamcontrol/lib/arm/Android.mk Normal file
View File

@@ -0,0 +1,18 @@
ifeq ($(TARGET_ARCH),arm)
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_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)
endif

0
proprietary/streamcontrol/lib/libWVStreamControlAPI_L1.so → proprietary/streamcontrol/lib/arm/libWVStreamControlAPI_L1.so
View File

0
proprietary/streamcontrol/lib/libWVStreamControlAPI_L3.so → proprietary/streamcontrol/lib/arm/libWVStreamControlAPI_L3.so
View File

18
proprietary/streamcontrol/lib/x86/Android.mk Normal file
View File

@@ -0,0 +1,18 @@
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_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)
endif

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

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

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