From b99a4c736f1146e7d7b1d60f51ed44bf8eb0929e Mon Sep 17 00:00:00 2001 From: "John W. Bruce" Date: Sat, 1 Apr 2017 19:05:30 -0700 Subject: [PATCH] Turn on 64-bit Executables on Supported Platforms 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 --- libwvdrmengine/Android.mk | 2 ++ libwvdrmengine/cdm/test/unit-test.mk | 2 ++ libwvdrmengine/mediacrypto/test/Android.mk | 4 ++++ libwvdrmengine/mediadrm/test/Android.mk | 4 ++++ libwvdrmengine/oemcrypto/test/Android.mk | 2 ++ libwvdrmengine/test/unit/Android.mk | 4 ++++ 6 files changed, 18 insertions(+) diff --git a/libwvdrmengine/Android.mk b/libwvdrmengine/Android.mk index bf289115..f40166ed 100644 --- a/libwvdrmengine/Android.mk +++ b/libwvdrmengine/Android.mk @@ -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_PROPRIETARY_MODULE := true +ifneq ($(ENABLE_MEDIADRM_64), true) LOCAL_MODULE_TARGET_ARCH := arm x86 mips +endif include $(BUILD_EXECUTABLE) diff --git a/libwvdrmengine/cdm/test/unit-test.mk b/libwvdrmengine/cdm/test/unit-test.mk index d5abfc69..b6bba23e 100644 --- a/libwvdrmengine/cdm/test/unit-test.mk +++ b/libwvdrmengine/cdm/test/unit-test.mk @@ -54,6 +54,8 @@ LOCAL_MODULE_OWNER := widevine LOCAL_PROPRIETARY_MODULE := true +ifneq ($(ENABLE_MEDIADRM_64), true) LOCAL_MODULE_TARGET_ARCH := arm x86 mips +endif include $(BUILD_EXECUTABLE) diff --git a/libwvdrmengine/mediacrypto/test/Android.mk b/libwvdrmengine/mediacrypto/test/Android.mk index 3fbf53d1..6bd6624e 100644 --- a/libwvdrmengine/mediacrypto/test/Android.mk +++ b/libwvdrmengine/mediacrypto/test/Android.mk @@ -49,7 +49,9 @@ LOCAL_MODULE_OWNER := widevine LOCAL_PROPRIETARY_MODULE := true +ifneq ($(ENABLE_MEDIADRM_64), true) LOCAL_MODULE_TARGET_ARCH := arm x86 mips +endif include $(BUILD_EXECUTABLE) @@ -114,6 +116,8 @@ LOCAL_MODULE_OWNER := widevine LOCAL_PROPRIETARY_MODULE := true +ifneq ($(ENABLE_MEDIADRM_64), true) LOCAL_MODULE_TARGET_ARCH := arm x86 mips +endif include $(BUILD_EXECUTABLE) diff --git a/libwvdrmengine/mediadrm/test/Android.mk b/libwvdrmengine/mediadrm/test/Android.mk index 8fdaca28..89500ce1 100644 --- a/libwvdrmengine/mediadrm/test/Android.mk +++ b/libwvdrmengine/mediadrm/test/Android.mk @@ -50,7 +50,9 @@ LOCAL_MODULE_OWNER := widevine LOCAL_PROPRIETARY_MODULE := true +ifneq ($(ENABLE_MEDIADRM_64), true) LOCAL_MODULE_TARGET_ARCH := arm x86 mips +endif include $(BUILD_EXECUTABLE) @@ -116,6 +118,8 @@ LOCAL_MODULE_OWNER := widevine LOCAL_PROPRIETARY_MODULE := true +ifneq ($(ENABLE_MEDIADRM_64), true) LOCAL_MODULE_TARGET_ARCH := arm x86 mips +endif include $(BUILD_EXECUTABLE) diff --git a/libwvdrmengine/oemcrypto/test/Android.mk b/libwvdrmengine/oemcrypto/test/Android.mk index 20ef7c34..86fbaab8 100644 --- a/libwvdrmengine/oemcrypto/test/Android.mk +++ b/libwvdrmengine/oemcrypto/test/Android.mk @@ -9,7 +9,9 @@ LOCAL_MODULE_OWNER := widevine LOCAL_PROPRIETARY_MODULE := true +ifneq ($(ENABLE_MEDIADRM_64), true) LOCAL_MODULE_TARGET_ARCH := arm x86 mips +endif include $(LOCAL_PATH)/common.mk diff --git a/libwvdrmengine/test/unit/Android.mk b/libwvdrmengine/test/unit/Android.mk index 635d68bc..2fe17374 100644 --- a/libwvdrmengine/test/unit/Android.mk +++ b/libwvdrmengine/test/unit/Android.mk @@ -38,7 +38,9 @@ LOCAL_MODULE_OWNER := widevine LOCAL_PROPRIETARY_MODULE := true +ifneq ($(ENABLE_MEDIADRM_64), true) LOCAL_MODULE_TARGET_ARCH := arm x86 mips +endif include $(BUILD_EXECUTABLE) @@ -85,6 +87,8 @@ LOCAL_MODULE_OWNER := widevine LOCAL_PROPRIETARY_MODULE := true +ifneq ($(ENABLE_MEDIADRM_64), true) LOCAL_MODULE_TARGET_ARCH := arm x86 mips +endif include $(BUILD_EXECUTABLE)