From fbe09949028f2eb2c4b1248750b31e790316a85c Mon Sep 17 00:00:00 2001 From: Jeff Tinker Date: Sat, 16 Aug 2014 12:11:05 -0700 Subject: [PATCH] Fix widevine unit test builds on 64-bit devices bug: 17080975 Change-Id: Ic54d484e18fe0416855264ca073474f3d597e1a3 --- libwvdrmengine/build_and_run_all_unit_tests.sh | 6 +++++- libwvdrmengine/cdm/Android.mk | 2 ++ libwvdrmengine/cdm/test/unit-test.mk | 2 ++ libwvdrmengine/mediacrypto/Android.mk | 2 ++ libwvdrmengine/mediacrypto/test/Android.mk | 2 ++ libwvdrmengine/mediadrm/Android.mk | 2 ++ libwvdrmengine/mediadrm/test/Android.mk | 2 ++ libwvdrmengine/oemcrypto/mock/Android.mk | 2 ++ libwvdrmengine/oemcrypto/test/Android.mk | 2 ++ libwvdrmengine/test/gmock/src/Android.mk | 4 ++++ libwvdrmengine/test/unit/Android.mk | 2 ++ 11 files changed, 27 insertions(+), 1 deletion(-) diff --git a/libwvdrmengine/build_and_run_all_unit_tests.sh b/libwvdrmengine/build_and_run_all_unit_tests.sh index ec278f10..3cd566f6 100755 --- a/libwvdrmengine/build_and_run_all_unit_tests.sh +++ b/libwvdrmengine/build_and_run_all_unit_tests.sh @@ -59,7 +59,11 @@ adb push $OUT/system/bin/file_store_unittest /system/bin adb push $OUT/system/bin/device_files_unittest /system/bin adb push $OUT/system/bin/timer_unittest /system/bin adb push $OUT/system/bin/libwvdrmengine_test /system/bin -adb install -r $OUT/system/app/MediaDrmAPITest.apk +if [ -r $OUT/system/app/MediaDrmAPITest.apk ]; then + install -r $OUT/system/app/MediaDrmAPITest.apk +else + install -r $OUT/system/app/MediaDrmAPITest/MediaDrmAPITest.apk +fi cd $ANDROID_BUILD_TOP/vendor/widevine/libwvdrmengine ./run_all_unit_tests.sh diff --git a/libwvdrmengine/cdm/Android.mk b/libwvdrmengine/cdm/Android.mk index 84e9d3c7..142d576d 100644 --- a/libwvdrmengine/cdm/Android.mk +++ b/libwvdrmengine/cdm/Android.mk @@ -38,4 +38,6 @@ LOCAL_SRC_FILES := \ LOCAL_MODULE := libcdm LOCAL_MODULE_TAGS := optional +LOCAL_MODULE_TARGET_ARCH := arm mips x86 + include $(BUILD_STATIC_LIBRARY) diff --git a/libwvdrmengine/cdm/test/unit-test.mk b/libwvdrmengine/cdm/test/unit-test.mk index f85c795a..2543dda9 100644 --- a/libwvdrmengine/cdm/test/unit-test.mk +++ b/libwvdrmengine/cdm/test/unit-test.mk @@ -58,4 +58,6 @@ LOCAL_CFLAGS += \ -DGTEST_HAS_TR1_TUPLE \ -DGTEST_USE_OWN_TR1_TUPLE \ +LOCAL_MODULE_TARGET_ARCH := arm mips x86 + include $(BUILD_EXECUTABLE) diff --git a/libwvdrmengine/mediacrypto/Android.mk b/libwvdrmengine/mediacrypto/Android.mk index 9b6eb3d0..af594569 100644 --- a/libwvdrmengine/mediacrypto/Android.mk +++ b/libwvdrmengine/mediacrypto/Android.mk @@ -20,4 +20,6 @@ LOCAL_MODULE := libwvdrmcryptoplugin LOCAL_MODULE_TAGS := optional +LOCAL_MODULE_TARGET_ARCH := arm mips x86 + include $(BUILD_STATIC_LIBRARY) diff --git a/libwvdrmengine/mediacrypto/test/Android.mk b/libwvdrmengine/mediacrypto/test/Android.mk index 64e381f7..f9d2fe28 100644 --- a/libwvdrmengine/mediacrypto/test/Android.mk +++ b/libwvdrmengine/mediacrypto/test/Android.mk @@ -59,4 +59,6 @@ LOCAL_MODULE := libwvdrmmediacrypto_test LOCAL_MODULE_TAGS := tests +LOCAL_MODULE_TARGET_ARCH := arm mips x86 + include $(BUILD_EXECUTABLE) diff --git a/libwvdrmengine/mediadrm/Android.mk b/libwvdrmengine/mediadrm/Android.mk index cbc2dd49..7935cf7b 100644 --- a/libwvdrmengine/mediadrm/Android.mk +++ b/libwvdrmengine/mediadrm/Android.mk @@ -20,4 +20,6 @@ LOCAL_MODULE := libwvdrmdrmplugin LOCAL_MODULE_TAGS := optional +LOCAL_MODULE_TARGET_ARCH := arm mips x86 + include $(BUILD_STATIC_LIBRARY) diff --git a/libwvdrmengine/mediadrm/test/Android.mk b/libwvdrmengine/mediadrm/test/Android.mk index 346a8e83..32585a68 100644 --- a/libwvdrmengine/mediadrm/test/Android.mk +++ b/libwvdrmengine/mediadrm/test/Android.mk @@ -58,4 +58,6 @@ LOCAL_MODULE := libwvdrmdrmplugin_test LOCAL_MODULE_TAGS := tests +LOCAL_MODULE_TARGET_ARCH := arm mips x86 + include $(BUILD_EXECUTABLE) diff --git a/libwvdrmengine/oemcrypto/mock/Android.mk b/libwvdrmengine/oemcrypto/mock/Android.mk index 948f1d53..08b0a56f 100644 --- a/libwvdrmengine/oemcrypto/mock/Android.mk +++ b/libwvdrmengine/oemcrypto/mock/Android.mk @@ -38,5 +38,7 @@ LOCAL_STATIC_LIBRARIES := \ LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR_SHARED_LIBRARIES) LOCAL_MODULE := liboemcrypto +LOCAL_MODULE_TARGET_ARCH := arm mips x86 + include $(BUILD_SHARED_LIBRARY) diff --git a/libwvdrmengine/oemcrypto/test/Android.mk b/libwvdrmengine/oemcrypto/test/Android.mk index da379b22..a385231f 100644 --- a/libwvdrmengine/oemcrypto/test/Android.mk +++ b/libwvdrmengine/oemcrypto/test/Android.mk @@ -37,4 +37,6 @@ LOCAL_SHARED_LIBRARIES := \ LOCAL_MODULE:=oemcrypto_test +LOCAL_MODULE_TARGET_ARCH := arm mips x86 + include $(BUILD_EXECUTABLE) diff --git a/libwvdrmengine/test/gmock/src/Android.mk b/libwvdrmengine/test/gmock/src/Android.mk index f05ac2c1..5bb0b355 100644 --- a/libwvdrmengine/test/gmock/src/Android.mk +++ b/libwvdrmengine/test/gmock/src/Android.mk @@ -45,6 +45,8 @@ LOCAL_CFLAGS += $(libgmock_cflags) LOCAL_MODULE := libgmock +LOCAL_MODULE_TARGET_ARCH := arm mips x86 + include $(BUILD_STATIC_LIBRARY) ####################################################################### @@ -66,4 +68,6 @@ LOCAL_CFLAGS += $(libgmock_cflags) LOCAL_MODULE := libgmock_main +LOCAL_MODULE_TARGET_ARCH := arm mips x86 + include $(BUILD_STATIC_LIBRARY) diff --git a/libwvdrmengine/test/unit/Android.mk b/libwvdrmengine/test/unit/Android.mk index 1c6ad957..6bbd55b1 100644 --- a/libwvdrmengine/test/unit/Android.mk +++ b/libwvdrmengine/test/unit/Android.mk @@ -32,4 +32,6 @@ LOCAL_MODULE := libwvdrmengine_test LOCAL_MODULE_TAGS := tests +LOCAL_MODULE_TARGET_ARCH := arm mips x86 + include $(BUILD_EXECUTABLE)