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

am d6b79557: widevine: support multilib builds

Browse Source 
* commit 'd6b79557aba05ad10f5ad4dda01800f07c11a888':
  widevine: support multilib builds
This commit is contained in:
Colin Cross
2014-02-21 13:54:20 +00:00
committed by Android Git Automerger
parent 641456cdcc d6b79557ab
commit 6386692315
21 changed files with 32 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
proprietary/drmwvmplugin/Android.mk
View File

@@ -31,8 +31,6 @@ include $(BUILD_JAVA_LIBRARY)
########################
ifneq ($(filter arm x86,$(TARGET_ARCH)),)
include $(CLEAR_VARS)
include $(TOP)/vendor/widevine/proprietary/drmwvmplugin/common.mk
@@ -43,9 +41,9 @@ LOCAL_SRC_FILES:= \
LOCAL_MODULE := libdrmwvmcommon
LOCAL_MODULE_TAGS := optional
LOCAL_MODULE_TARGET_ARCH := $(WIDEVINE_SUPPORTED_ARCH)
include $(BUILD_STATIC_LIBRARY)
# invoke Android.mk files in subdirs
include $(call all-makefiles-under,$(LOCAL_PATH))
endif

4
proprietary/drmwvmplugin/common.mk
View File

@@ -8,6 +8,4 @@ LOCAL_C_INCLUDES:= \
$(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
LOCAL_C_INCLUDES_x86 += $(TOP)/system/core/include/arch/linux-x86

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

@@ -1,5 +1 @@
ifneq ($(filter arm x86,$(TARGET_ARCH)),)
include $(call all-subdir-makefiles)
endif

5
proprietary/drmwvmplugin/lib/arm/Android.mk
View File

@@ -1,5 +1,3 @@
ifeq ($(TARGET_ARCH),arm)
LOCAL_PATH:= $(call my-dir)
ifneq ($(BOARD_USES_GENERIC_WIDEVINE),false)
@@ -18,6 +16,7 @@ LOCAL_STRIP_MODULE := true
LOCAL_MODULE_TAGS := optional
LOCAL_MODULE_OWNER := widevine
LOCAL_MODULE_TARGET_ARCH := arm
include $(BUILD_PREBUILT)
#########################################################################
@@ -31,8 +30,8 @@ LOCAL_MODULE_SUFFIX := .a
LOCAL_SRC_FILES := $(LOCAL_MODULE)$(LOCAL_MODULE_SUFFIX)
LOCAL_MODULE_TAGS := optional
LOCAL_MODULE_TARGET_ARCH := arm
include $(BUILD_PREBUILT)
endif
endif

6
proprietary/drmwvmplugin/lib/x86/Android.mk
View File

@@ -1,5 +1,3 @@
ifeq ($(TARGET_ARCH),x86)
LOCAL_PATH:= $(call my-dir)
#########################################################################
@@ -15,6 +13,7 @@ LOCAL_PROPRIETARY_MODULE := true
LOCAL_STRIP_MODULE := true
LOCAL_MODULE_TAGS := optional
LOCAL_MODULE_TARGET_ARCH := x86
include $(BUILD_PREBUILT)
#########################################################################
@@ -28,6 +27,5 @@ LOCAL_MODULE_SUFFIX := .a
LOCAL_SRC_FILES := $(LOCAL_MODULE)$(LOCAL_MODULE_SUFFIX)
LOCAL_MODULE_TAGS := optional
LOCAL_MODULE_TARGET_ARCH := x86
include $(BUILD_PREBUILT)
endif

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

@@ -1,5 +1,3 @@
ifneq ($(filter arm x86,$(TARGET_ARCH)),)
LOCAL_PATH:= $(call my-dir)
include $(CLEAR_VARS)
@@ -16,9 +14,7 @@ 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_C_INCLUDES_x86 += $(TOP)/system/core/include/arch/linux-x86
LOCAL_SHARED_LIBRARIES := \
libstlport \
@@ -34,6 +30,6 @@ LOCAL_MODULE:=test-wvdrmplugin
LOCAL_MODULE_TAGS := tests
include $(BUILD_EXECUTABLE)
LOCAL_MODULE_TARGET_ARCH := $(WIDEVINE_SUPPORTED_ARCH)
endif
include $(BUILD_EXECUTABLE)