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

Fix widevine unit test builds on 64-bit devices

Browse Source 
bug: 17080975
Change-Id: Ic54d484e18fe0416855264ca073474f3d597e1a3
This commit is contained in:
Jeff Tinker
2014-08-16 12:11:05 -07:00
parent 157afc627a
commit fbe0994902
11 changed files with 27 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libwvdrmengine/build_and_run_all_unit_tests.sh
View File

@@ -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/device_files_unittest /system/bin
adb push $OUT/system/bin/timer_unittest /system/bin adb push $OUT/system/bin/timer_unittest /system/bin
adb push $OUT/system/bin/libwvdrmengine_test /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 cd $ANDROID_BUILD_TOP/vendor/widevine/libwvdrmengine
./run_all_unit_tests.sh ./run_all_unit_tests.sh

2
libwvdrmengine/cdm/Android.mk
View File

@@ -38,4 +38,6 @@ LOCAL_SRC_FILES := \
LOCAL_MODULE := libcdm LOCAL_MODULE := libcdm
LOCAL_MODULE_TAGS := optional LOCAL_MODULE_TAGS := optional
LOCAL_MODULE_TARGET_ARCH := arm mips x86
include $(BUILD_STATIC_LIBRARY) include $(BUILD_STATIC_LIBRARY)

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

@@ -58,4 +58,6 @@ LOCAL_CFLAGS += \
-DGTEST_HAS_TR1_TUPLE \ -DGTEST_HAS_TR1_TUPLE \
-DGTEST_USE_OWN_TR1_TUPLE \ -DGTEST_USE_OWN_TR1_TUPLE \
LOCAL_MODULE_TARGET_ARCH := arm mips x86
include $(BUILD_EXECUTABLE) include $(BUILD_EXECUTABLE)

2
libwvdrmengine/mediacrypto/Android.mk
View File

@@ -20,4 +20,6 @@ LOCAL_MODULE := libwvdrmcryptoplugin
LOCAL_MODULE_TAGS := optional LOCAL_MODULE_TAGS := optional
LOCAL_MODULE_TARGET_ARCH := arm mips x86
include $(BUILD_STATIC_LIBRARY) include $(BUILD_STATIC_LIBRARY)

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

@@ -59,4 +59,6 @@ LOCAL_MODULE := libwvdrmmediacrypto_test
LOCAL_MODULE_TAGS := tests LOCAL_MODULE_TAGS := tests
LOCAL_MODULE_TARGET_ARCH := arm mips x86
include $(BUILD_EXECUTABLE) include $(BUILD_EXECUTABLE)

2
libwvdrmengine/mediadrm/Android.mk
View File

@@ -20,4 +20,6 @@ LOCAL_MODULE := libwvdrmdrmplugin
LOCAL_MODULE_TAGS := optional LOCAL_MODULE_TAGS := optional
LOCAL_MODULE_TARGET_ARCH := arm mips x86
include $(BUILD_STATIC_LIBRARY) include $(BUILD_STATIC_LIBRARY)

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

@@ -58,4 +58,6 @@ LOCAL_MODULE := libwvdrmdrmplugin_test
LOCAL_MODULE_TAGS := tests LOCAL_MODULE_TAGS := tests
LOCAL_MODULE_TARGET_ARCH := arm mips x86
include $(BUILD_EXECUTABLE) include $(BUILD_EXECUTABLE)

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

@@ -38,5 +38,7 @@ LOCAL_STATIC_LIBRARIES := \
LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR_SHARED_LIBRARIES) LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR_SHARED_LIBRARIES)
LOCAL_MODULE := liboemcrypto LOCAL_MODULE := liboemcrypto
LOCAL_MODULE_TARGET_ARCH := arm mips x86
include $(BUILD_SHARED_LIBRARY) include $(BUILD_SHARED_LIBRARY)

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

@@ -37,4 +37,6 @@ LOCAL_SHARED_LIBRARIES := \
LOCAL_MODULE:=oemcrypto_test LOCAL_MODULE:=oemcrypto_test
LOCAL_MODULE_TARGET_ARCH := arm mips x86
include $(BUILD_EXECUTABLE) include $(BUILD_EXECUTABLE)

4
libwvdrmengine/test/gmock/src/Android.mk
View File

@@ -45,6 +45,8 @@ LOCAL_CFLAGS += $(libgmock_cflags)
LOCAL_MODULE := libgmock LOCAL_MODULE := libgmock
LOCAL_MODULE_TARGET_ARCH := arm mips x86
include $(BUILD_STATIC_LIBRARY) include $(BUILD_STATIC_LIBRARY)
####################################################################### #######################################################################
@@ -66,4 +68,6 @@ LOCAL_CFLAGS += $(libgmock_cflags)
LOCAL_MODULE := libgmock_main LOCAL_MODULE := libgmock_main
LOCAL_MODULE_TARGET_ARCH := arm mips x86
include $(BUILD_STATIC_LIBRARY) include $(BUILD_STATIC_LIBRARY)

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

@@ -32,4 +32,6 @@ LOCAL_MODULE := libwvdrmengine_test
LOCAL_MODULE_TAGS := tests LOCAL_MODULE_TAGS := tests
LOCAL_MODULE_TARGET_ARCH := arm mips x86
include $(BUILD_EXECUTABLE) include $(BUILD_EXECUTABLE)