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

Fix multilib issues

Browse Source 
Change-Id: I069c8681d2b25221e8767db9437dbfded5618283
This commit is contained in:
Jeff Tinker
2014-05-19 16:49:17 -07:00
parent e56e58fbf5
commit 6f35b0b86c
6 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
proprietary/drmwvmplugin/include/WVMDrmPlugin.h
View File

@@ -50,7 +50,7 @@ protected:
status_t onConsumeRights(int uniqueId, DecryptHandle* decryptHandle, int action, bool reserve); status_t onConsumeRights(int uniqueId, DecryptHandle* decryptHandle, int action, bool reserve);
status_t onSetPlaybackStatus( status_t onSetPlaybackStatus(
int uniqueId, DecryptHandle* decryptHandle, int playbackStatus, off64_t position); int uniqueId, DecryptHandle* decryptHandle, int playbackStatus, int64_t position);
bool onValidateAction( bool onValidateAction(
int uniqueId, const String8& path, int action, const ActionDescription& description); int uniqueId, const String8& path, int action, const ActionDescription& description);

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

@@ -17,6 +17,7 @@ LOCAL_STRIP_MODULE := true
LOCAL_MODULE_TAGS := optional LOCAL_MODULE_TAGS := optional
LOCAL_MODULE_OWNER := widevine LOCAL_MODULE_OWNER := widevine
LOCAL_MODULE_TARGET_ARCH := arm LOCAL_MODULE_TARGET_ARCH := arm
LOCAL_MULTILIB := 32
include $(BUILD_PREBUILT) include $(BUILD_PREBUILT)
######################################################################### #########################################################################

2
proprietary/drmwvmplugin/src/WVMDrmPlugin.cpp
View File

@@ -635,7 +635,7 @@ status_t WVMDrmPlugin::onConsumeRights(int uniqueId, DecryptHandle* decryptHandl
* Returns DRM_NO_ERROR for success, DRM_ERROR_UNKNOWN for failure * Returns DRM_NO_ERROR for success, DRM_ERROR_UNKNOWN for failure
*/ */
status_t WVMDrmPlugin::onSetPlaybackStatus(int uniqueId, DecryptHandle* decryptHandle, status_t WVMDrmPlugin::onSetPlaybackStatus(int uniqueId, DecryptHandle* decryptHandle,
int playbackStatus, off64_t position) { int playbackStatus, int64_t position) {
//ALOGD("WVMDrmPlugin::onSetPlaybackStatus"); //ALOGD("WVMDrmPlugin::onSetPlaybackStatus");
int op; int op;

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

@@ -14,6 +14,7 @@ LOCAL_STRIP_MODULE := true
LOCAL_MODULE_TAGS := optional LOCAL_MODULE_TAGS := optional
LOCAL_MODULE_OWNER := widevine LOCAL_MODULE_OWNER := widevine
LOCAL_MODULE_TARGET_ARCH := arm LOCAL_MODULE_TARGET_ARCH := arm
LOCAL_MULTILIB := 32
include $(BUILD_PREBUILT) include $(BUILD_PREBUILT)
endif endif

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

@@ -32,5 +32,6 @@ LOCAL_SHARED_LIBRARIES := \
LOCAL_MODULE:=test-wvplayer_L$(BOARD_WIDEVINE_OEMCRYPTO_LEVEL) LOCAL_MODULE:=test-wvplayer_L$(BOARD_WIDEVINE_OEMCRYPTO_LEVEL)
LOCAL_MODULE_TARGET_ARCH := $(WIDEVINE_SUPPORTED_ARCH) LOCAL_MODULE_TARGET_ARCH := $(WIDEVINE_SUPPORTED_ARCH)
LOCAL_MULTILIB := 32
include $(BUILD_EXECUTABLE) include $(BUILD_EXECUTABLE)

1
proprietary/wvm/Android.mk
View File

@@ -21,4 +21,5 @@ LOCAL_SHARED_LIBRARIES := \
LOCAL_MODULE := libwvmcommon LOCAL_MODULE := libwvmcommon
LOCAL_MODULE_TAGS := optional LOCAL_MODULE_TAGS := optional
LOCAL_MODULE_TARGET_ARCH := $(WIDEVINE_SUPPORTED_ARCH) LOCAL_MODULE_TARGET_ARCH := $(WIDEVINE_SUPPORTED_ARCH)
LOCAL_MULTILIB := 32
include $(BUILD_STATIC_LIBRARY) include $(BUILD_STATIC_LIBRARY)