| author | Joy Rao <joy.rao@amlogic.com> | 2016-10-29 08:38:36 (GMT) |
|---|---|---|
| committer | Joy Rao <joy.rao@amlogic.com> | 2016-10-29 08:38:36 (GMT) |
| commit | d564a72b64d8d134dccab8e166b5db0c47a4c3dd (patch) | |
| tree | 74d64577f52e8a172a12992497e74953ff02e682 | |
| parent | 63198f8b553fcef9dc7f63bcc36a1b5aed7af2c5 (diff) | |
| download | playready-d564a72b64d8d134dccab8e166b5db0c47a4c3dd.zip playready-d564a72b64d8d134dccab8e166b5db0c47a4c3dd.tar.gz playready-d564a72b64d8d134dccab8e166b5db0c47a4c3dd.tar.bz2 | |
PD#133864:PlayReady, n support (for 64 bit)
ca:bcf57dd82f386dc1e72436743139821ee6d104d3
ta:c4cfff37b154f42d45be4d34165a2337de20573e
Change-Id: I827368a2ce5a7d73cc83d5f5a71e3b29033e260d
| -rw-r--r-- | Android.mk | 3 | ||||
| -rw-r--r-- | SmoothStreaming/Android.mk | 2 | ||||
| -rw-r--r-- | mediadrmplugin/Android.mk | 7 | ||||
| -rw-r--r-- | playreadyplugin/Android.mk | 6 | ||||
| -rw-r--r-- | playreadyplugin/libplayready_session/Android.mk | 3 |
5 files changed, 11 insertions, 10 deletions
@@ -1,7 +1,8 @@ # playready prebuilts only available for ARM -ifeq ($(TARGET_ARCH),arm) +ifneq ($(filter arm arm64,$(TARGET_ARCH)),) ifeq ($(BUILD_WITH_PLAYREADY_DRM), true) +LOCAL_32_BIT_ONLY := true include $(call all-subdir-makefiles) endif diff --git a/SmoothStreaming/Android.mk b/SmoothStreaming/Android.mk index 7f075f7..73dcf05 100644 --- a/SmoothStreaming/Android.mk +++ b/SmoothStreaming/Android.mk @@ -41,7 +41,7 @@ LOCAL_MODULE_CLASS := SHARED_LIBRARIES LOCAL_MODULE_SUFFIX := .so LOCAL_PROPRIETARY_MODULE := true LOCAL_STRIP_MODULE := false - +LOCAL_32_BIT_ONLY := true LOCAL_MODULE_TAGS := optional include $(BUILD_PREBUILT) diff --git a/mediadrmplugin/Android.mk b/mediadrmplugin/Android.mk index b211017..f4e326d 100644 --- a/mediadrmplugin/Android.mk +++ b/mediadrmplugin/Android.mk @@ -5,13 +5,14 @@ ifeq ($(BOARD_PLAYREADY_TVP),true) # libplayreadydrmplugin.so include $(CLEAR_VARS) LOCAL_MODULE := libplayreadymediadrmplugin -LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR_SHARED_LIBRARIES)/mediadrm +LOCAL_MODULE_PATH := $(TARGET_OUT)/vendor/lib/mediadrm LOCAL_MODULE_CLASS := SHARED_LIBRARIES LOCAL_MODULE_SUFFIX := .so LOCAL_SRC_FILES := TVP/libplayreadymediadrmplugin.so LOCAL_PROPRIETARY_MODULE := true LOCAL_STRIP_MODULE := false +LOCAL_32_BIT_ONLY := true LOCAL_MODULE_TAGS := optional include $(BUILD_PREBUILT) @@ -23,13 +24,13 @@ else # libplayreadydrmplugin.so include $(CLEAR_VARS) LOCAL_MODULE := libplayreadymediadrmplugin -LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR_SHARED_LIBRARIES)/mediadrm +LOCAL_MODULE_PATH := $(TARGET_OUT)/vendor/lib/mediadrm LOCAL_MODULE_CLASS := SHARED_LIBRARIES LOCAL_MODULE_SUFFIX := .so LOCAL_SRC_FILES := NOTVP/libplayreadymediadrmplugin.so LOCAL_PROPRIETARY_MODULE := true LOCAL_STRIP_MODULE := false - +LOCAL_32_BIT_ONLY := true LOCAL_MODULE_TAGS := optional include $(BUILD_PREBUILT) diff --git a/playreadyplugin/Android.mk b/playreadyplugin/Android.mk index a463eec..cb1e073 100644 --- a/playreadyplugin/Android.mk +++ b/playreadyplugin/Android.mk @@ -27,15 +27,13 @@ LOCAL_MODULE := libdrmclientplayreadyplugin LOCAL_MODULE_CLASS := SHARED_LIBRARIES LOCAL_MODULE_SUFFIX := .so LOCAL_SRC_FILES := $(LOCAL_MODULE)$(LOCAL_MODULE_SUFFIX) -LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/drm +LOCAL_MODULE_PATH := $(TARGET_OUT)/vendor/lib/drm OVERRIDE_BUILT_MODULE_PATH := $(TARGET_OUT_INTERMEDIATE_LIBRARIES) LOCAL_MODULE_TAGS := optional LOCAL_REQUIRED_MODULES := libplayready +LOCAL_32_BIT_ONLY := true -ifeq ($(BOARD_PLAYREADY_TVP),true) -LOCAL_REQUIRED_MODULES += libplayreadysecos_api playready_tzo -endif include $(BUILD_PREBUILT) diff --git a/playreadyplugin/libplayready_session/Android.mk b/playreadyplugin/libplayready_session/Android.mk index dc3ccd9..0adcb3a 100644 --- a/playreadyplugin/libplayready_session/Android.mk +++ b/playreadyplugin/libplayready_session/Android.mk @@ -13,7 +13,7 @@ else endif LOCAL_PROPRIETARY_MODULE := true LOCAL_STRIP_MODULE := false - +LOCAL_32_BIT_ONLY := true LOCAL_MODULE_TAGS := optional include $(BUILD_PREBUILT) @@ -28,6 +28,7 @@ LOCAL_SRC_FILES :=TVP/9a04f079-9840-4286-ab92e65be0885f95.ta LOCAL_MODULE_TAGS := optional LOCAL_MODULE_CLASS := SHARED_LIBRARIES LOCAL_MODULE_SUFFIX := .ta +LOCAL_32_BIT_ONLY := true LOCAL_MODULE_PATH := $(TA_EXPORT_DIR) LOCAL_STRIP_MODULE := false include $(BUILD_PREBUILT) |