From 6f35b0b86c2577bc0704d36a35a79bdf1529f481 Mon Sep 17 00:00:00 2001
From: Jeff Tinker <jtinker@google.com>
Date: Mon, 19 May 2014 16:49:17 -0700
Subject: [PATCH] Fix multilib issues

Change-Id: I069c8681d2b25221e8767db9437dbfded5618283
---
 proprietary/drmwvmplugin/include/WVMDrmPlugin.h | 2 +-
 proprietary/drmwvmplugin/lib/arm/Android.mk     | 1 +
 proprietary/drmwvmplugin/src/WVMDrmPlugin.cpp   | 2 +-
 proprietary/streamcontrol/lib/arm/Android.mk    | 1 +
 proprietary/streamcontrol/test/Android.mk       | 1 +
 proprietary/wvm/Android.mk                      | 1 +
 6 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/proprietary/drmwvmplugin/include/WVMDrmPlugin.h b/proprietary/drmwvmplugin/include/WVMDrmPlugin.h
index ad92583c..b85e0639 100644
--- a/proprietary/drmwvmplugin/include/WVMDrmPlugin.h
+++ b/proprietary/drmwvmplugin/include/WVMDrmPlugin.h
@@ -50,7 +50,7 @@ protected:
     status_t onConsumeRights(int uniqueId, DecryptHandle* decryptHandle, int action, bool reserve);
 
     status_t onSetPlaybackStatus(
-            int uniqueId, DecryptHandle* decryptHandle, int playbackStatus, off64_t position);
+            int uniqueId, DecryptHandle* decryptHandle, int playbackStatus, int64_t position);
 
     bool onValidateAction(
             int uniqueId, const String8& path, int action, const ActionDescription& description);
diff --git a/proprietary/drmwvmplugin/lib/arm/Android.mk b/proprietary/drmwvmplugin/lib/arm/Android.mk
index 832e695c..3e972c61 100644
--- a/proprietary/drmwvmplugin/lib/arm/Android.mk
+++ b/proprietary/drmwvmplugin/lib/arm/Android.mk
@@ -17,6 +17,7 @@ LOCAL_STRIP_MODULE := true
 LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE_OWNER := widevine
 LOCAL_MODULE_TARGET_ARCH := arm
+LOCAL_MULTILIB := 32
 include $(BUILD_PREBUILT)
 
 #########################################################################
diff --git a/proprietary/drmwvmplugin/src/WVMDrmPlugin.cpp b/proprietary/drmwvmplugin/src/WVMDrmPlugin.cpp
index 2f10cfc3..17afe6f8 100644
--- a/proprietary/drmwvmplugin/src/WVMDrmPlugin.cpp
+++ b/proprietary/drmwvmplugin/src/WVMDrmPlugin.cpp
@@ -635,7 +635,7 @@ status_t WVMDrmPlugin::onConsumeRights(int uniqueId, DecryptHandle* decryptHandl
  *     Returns DRM_NO_ERROR for success, DRM_ERROR_UNKNOWN for failure
  */
 status_t WVMDrmPlugin::onSetPlaybackStatus(int uniqueId, DecryptHandle* decryptHandle,
-            int playbackStatus, off64_t position) {
+            int playbackStatus, int64_t position) {
     //ALOGD("WVMDrmPlugin::onSetPlaybackStatus");
 
     int op;
diff --git a/proprietary/streamcontrol/lib/arm/Android.mk b/proprietary/streamcontrol/lib/arm/Android.mk
index e7ae6c4f..bfff9bcc 100644
--- a/proprietary/streamcontrol/lib/arm/Android.mk
+++ b/proprietary/streamcontrol/lib/arm/Android.mk
@@ -14,6 +14,7 @@ LOCAL_STRIP_MODULE := true
 LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE_OWNER := widevine
 LOCAL_MODULE_TARGET_ARCH := arm
+LOCAL_MULTILIB := 32
 include $(BUILD_PREBUILT)
 
 endif
diff --git a/proprietary/streamcontrol/test/Android.mk b/proprietary/streamcontrol/test/Android.mk
index 5f11dafd..857c3df5 100644
--- a/proprietary/streamcontrol/test/Android.mk
+++ b/proprietary/streamcontrol/test/Android.mk
@@ -32,5 +32,6 @@ LOCAL_SHARED_LIBRARIES := \
 LOCAL_MODULE:=test-wvplayer_L$(BOARD_WIDEVINE_OEMCRYPTO_LEVEL)
 
 LOCAL_MODULE_TARGET_ARCH := $(WIDEVINE_SUPPORTED_ARCH)
+LOCAL_MULTILIB := 32
 
 include $(BUILD_EXECUTABLE)
diff --git a/proprietary/wvm/Android.mk b/proprietary/wvm/Android.mk
index 5c5331a4..c3e20319 100644
--- a/proprietary/wvm/Android.mk
+++ b/proprietary/wvm/Android.mk
@@ -21,4 +21,5 @@ LOCAL_SHARED_LIBRARIES := \
 LOCAL_MODULE := libwvmcommon
 LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE_TARGET_ARCH := $(WIDEVINE_SUPPORTED_ARCH)
+LOCAL_MULTILIB := 32
 include $(BUILD_STATIC_LIBRARY)