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

Turn off mips64 library (second attempt)

Browse Source 
am: 9bf25bc

* commit '9bf25bc67f525bc588c7f0294e2b409c9d053db4':
  Turn off mips64 library (second attempt)
This commit is contained in:
Fred Gylys-Colwell
2016-03-24 04:13:22 +00:00
committed by android-build-merger
parent 42c7cc700c 9bf25bc67f
commit 3da72c8fdf
2 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
libwvdrmengine/Android.mk
View File

@@ -1,3 +1,5 @@
# This library does not build on mips64.
ifneq (mips64,$(TARGET_ARCH))
# ----------------------------------------------------------------------------- # -----------------------------------------------------------------------------
# CDM top level makefile # CDM top level makefile
# #
@@ -112,13 +114,11 @@ LOCAL_PROPRIETARY_MODULE := true
LOCAL_MODULE_TARGET_ARCH := arm x86 mips 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 $(BUILD_SHARED_LIBRARY)
include vendor/widevine/libwvdrmengine/cdm/Android.mk include vendor/widevine/libwvdrmengine/cdm/Android.mk
include vendor/widevine/libwvdrmengine/level3/Android.mk include vendor/widevine/libwvdrmengine/level3/Android.mk
include vendor/widevine/libwvdrmengine/mediacrypto/Android.mk include vendor/widevine/libwvdrmengine/mediacrypto/Android.mk
include vendor/widevine/libwvdrmengine/mediadrm/Android.mk include vendor/widevine/libwvdrmengine/mediadrm/Android.mk
endif # if target is mips64.

2
libwvdrmengine/level3/mips/Android.mk
View File

@@ -9,6 +9,4 @@ LOCAL_PROPRIETARY_MODULE := true
LOCAL_MODULE_TAGS := optional LOCAL_MODULE_TAGS := optional
LOCAL_MODULE_OWNER := widevine LOCAL_MODULE_OWNER := widevine
LOCAL_MODULE_TARGET_ARCH := mips 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) include $(BUILD_PREBUILT)