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

Turn on 64-bit Executables on Supported Platforms

Browse Source 
This commit changes the unit tests and HAL Service to run as 64-bit on
devices that have enabled 64-bit DRM Plugins.

Bug: 36076017
Test: Turned on the flag for a device and used the file command to
      verify that all binaries were built as 64-bit.
Test: Turned the flag back off and verified that all binaries were built
      as 32-bit. This should affect no current devices.
Change-Id: Ieb7218f15b9359f2038a6f60b8c994b16d2b5b53
This commit is contained in:
John W. Bruce
2017-04-01 19:05:30 -07:00
parent b3ea54b6dc
commit b99a4c736f
6 changed files with 18 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libwvdrmengine/Android.mk
View File

@@ -30,7 +30,9 @@ LOCAL_INIT_RC := src_hidl/android.hardware.drm@1.0-service.widevine.rc
LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR)/bin/hw LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR)/bin/hw
LOCAL_PROPRIETARY_MODULE := true LOCAL_PROPRIETARY_MODULE := true
ifneq ($(ENABLE_MEDIADRM_64), true)
LOCAL_MODULE_TARGET_ARCH := arm x86 mips LOCAL_MODULE_TARGET_ARCH := arm x86 mips
endif
include $(BUILD_EXECUTABLE) include $(BUILD_EXECUTABLE)

2
libwvdrmengine/cdm/test/unit-test.mk
View File

@@ -54,6 +54,8 @@ LOCAL_MODULE_OWNER := widevine
LOCAL_PROPRIETARY_MODULE := true LOCAL_PROPRIETARY_MODULE := true
ifneq ($(ENABLE_MEDIADRM_64), true)
LOCAL_MODULE_TARGET_ARCH := arm x86 mips LOCAL_MODULE_TARGET_ARCH := arm x86 mips
endif
include $(BUILD_EXECUTABLE) include $(BUILD_EXECUTABLE)

4
libwvdrmengine/mediacrypto/test/Android.mk
View File

@@ -49,7 +49,9 @@ LOCAL_MODULE_OWNER := widevine
LOCAL_PROPRIETARY_MODULE := true LOCAL_PROPRIETARY_MODULE := true
ifneq ($(ENABLE_MEDIADRM_64), true)
LOCAL_MODULE_TARGET_ARCH := arm x86 mips LOCAL_MODULE_TARGET_ARCH := arm x86 mips
endif
include $(BUILD_EXECUTABLE) include $(BUILD_EXECUTABLE)
@@ -114,6 +116,8 @@ LOCAL_MODULE_OWNER := widevine
LOCAL_PROPRIETARY_MODULE := true LOCAL_PROPRIETARY_MODULE := true
ifneq ($(ENABLE_MEDIADRM_64), true)
LOCAL_MODULE_TARGET_ARCH := arm x86 mips LOCAL_MODULE_TARGET_ARCH := arm x86 mips
endif
include $(BUILD_EXECUTABLE) include $(BUILD_EXECUTABLE)

4
libwvdrmengine/mediadrm/test/Android.mk
View File

@@ -50,7 +50,9 @@ LOCAL_MODULE_OWNER := widevine
LOCAL_PROPRIETARY_MODULE := true LOCAL_PROPRIETARY_MODULE := true
ifneq ($(ENABLE_MEDIADRM_64), true)
LOCAL_MODULE_TARGET_ARCH := arm x86 mips LOCAL_MODULE_TARGET_ARCH := arm x86 mips
endif
include $(BUILD_EXECUTABLE) include $(BUILD_EXECUTABLE)
@@ -116,6 +118,8 @@ LOCAL_MODULE_OWNER := widevine
LOCAL_PROPRIETARY_MODULE := true LOCAL_PROPRIETARY_MODULE := true
ifneq ($(ENABLE_MEDIADRM_64), true)
LOCAL_MODULE_TARGET_ARCH := arm x86 mips LOCAL_MODULE_TARGET_ARCH := arm x86 mips
endif
include $(BUILD_EXECUTABLE) include $(BUILD_EXECUTABLE)

2
libwvdrmengine/oemcrypto/test/Android.mk
View File

@@ -9,7 +9,9 @@ LOCAL_MODULE_OWNER := widevine
LOCAL_PROPRIETARY_MODULE := true LOCAL_PROPRIETARY_MODULE := true
ifneq ($(ENABLE_MEDIADRM_64), true)
LOCAL_MODULE_TARGET_ARCH := arm x86 mips LOCAL_MODULE_TARGET_ARCH := arm x86 mips
endif
include $(LOCAL_PATH)/common.mk include $(LOCAL_PATH)/common.mk

4
libwvdrmengine/test/unit/Android.mk
View File

@@ -38,7 +38,9 @@ LOCAL_MODULE_OWNER := widevine
LOCAL_PROPRIETARY_MODULE := true LOCAL_PROPRIETARY_MODULE := true
ifneq ($(ENABLE_MEDIADRM_64), true)
LOCAL_MODULE_TARGET_ARCH := arm x86 mips LOCAL_MODULE_TARGET_ARCH := arm x86 mips
endif
include $(BUILD_EXECUTABLE) include $(BUILD_EXECUTABLE)
@@ -85,6 +87,8 @@ LOCAL_MODULE_OWNER := widevine
LOCAL_PROPRIETARY_MODULE := true LOCAL_PROPRIETARY_MODULE := true
ifneq ($(ENABLE_MEDIADRM_64), true)
LOCAL_MODULE_TARGET_ARCH := arm x86 mips LOCAL_MODULE_TARGET_ARCH := arm x86 mips
endif
include $(BUILD_EXECUTABLE) include $(BUILD_EXECUTABLE)