From 9bf25bc67f525bc588c7f0294e2b409c9d053db4 Mon Sep 17 00:00:00 2001 From: Fred Gylys-Colwell Date: Wed, 23 Mar 2016 20:45:43 -0700 Subject: [PATCH] Turn off mips64 library (second attempt) Merge from widevine repo of http://go/wvgerrit/17223/3 This time I mean it. b/27786231 Change-Id: I8d4d3acf7470c8b5878b90774f97b5fce1011ccf --- libwvdrmengine/Android.mk | 8 ++++---- libwvdrmengine/level3/mips/Android.mk | 2 -- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/libwvdrmengine/Android.mk b/libwvdrmengine/Android.mk index 60e18e23..32cb7ef3 100644 --- a/libwvdrmengine/Android.mk +++ b/libwvdrmengine/Android.mk @@ -1,3 +1,5 @@ +# This library does not build on mips64. +ifneq (mips64,$(TARGET_ARCH)) # ----------------------------------------------------------------------------- # CDM top level makefile # @@ -112,13 +114,11 @@ LOCAL_PROPRIETARY_MODULE := true LOCAL_MODULE_TARGET_ARCH := arm x86 mips -# Level 3 library does not build or link on mips 64. -# Until we have a stable test platform, we will disable DRM on mips64. -LOCAL_MODULE_UNSUPPORTED_TARGET_ARCH := mips64 - include $(BUILD_SHARED_LIBRARY) include vendor/widevine/libwvdrmengine/cdm/Android.mk include vendor/widevine/libwvdrmengine/level3/Android.mk include vendor/widevine/libwvdrmengine/mediacrypto/Android.mk include vendor/widevine/libwvdrmengine/mediadrm/Android.mk + +endif # if target is mips64. diff --git a/libwvdrmengine/level3/mips/Android.mk b/libwvdrmengine/level3/mips/Android.mk index c4b8fda3..4f4b083a 100644 --- a/libwvdrmengine/level3/mips/Android.mk +++ b/libwvdrmengine/level3/mips/Android.mk @@ -9,6 +9,4 @@ LOCAL_PROPRIETARY_MODULE := true LOCAL_MODULE_TAGS := optional LOCAL_MODULE_OWNER := widevine LOCAL_MODULE_TARGET_ARCH := mips -# mips 32 bit library does not run on 64 bit chips. -LOCAL_MODULE_UNSUPPORTED_TARGET_ARCH := mips64 include $(BUILD_PREBUILT)