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

Build Android Unit Tests 32-bit Only

Browse Source 
(This is a merge of http://go/wvgerrit/24738)

The change to enable 64-bit as a possible target for Widevine Android
made all the unit tests build as 64-bit on compatible platforms. Since
none of these devices support 64-bit properly yet, this is a mistake.
This patch restores unit test builds to being 32-bit only for now.

In the future, when the switch for 64-bit-supporting devices is added,
it will also switch the unit tests to 64-bit mode.

Bug: 36071236
Test: Verified unit test format with "file" command.
Change-Id: Ib4d3678181f3221b85fe6409f1d842dd15af3daa
This commit is contained in:
John W. Bruce
2017-03-21 21:53:22 -07:00
parent 99566d48e9
commit bfe6046199
5 changed files with 16 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -50,4 +50,6 @@ LOCAL_SHARED_LIBRARIES := \
LOCAL_CFLAGS += -DUNIT_TEST LOCAL_CFLAGS += -DUNIT_TEST
LOCAL_MODULE_TARGET_ARCH := arm x86 mips
include $(BUILD_EXECUTABLE) include $(BUILD_EXECUTABLE)

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

@@ -45,6 +45,8 @@ LOCAL_MODULE := libwvdrmmediacrypto_test
LOCAL_MODULE_TAGS := tests LOCAL_MODULE_TAGS := tests
LOCAL_MODULE_TARGET_ARCH := arm x86 mips
include $(BUILD_EXECUTABLE) include $(BUILD_EXECUTABLE)
# ----------------------------------------------------------------------------- # -----------------------------------------------------------------------------
@@ -104,4 +106,6 @@ LOCAL_MODULE := libwvdrmmediacrypto_hidl_test
LOCAL_MODULE_TAGS := tests LOCAL_MODULE_TAGS := tests
LOCAL_MODULE_TARGET_ARCH := arm x86 mips
include $(BUILD_EXECUTABLE) include $(BUILD_EXECUTABLE)

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

@@ -46,6 +46,8 @@ LOCAL_MODULE := libwvdrmdrmplugin_test
LOCAL_MODULE_TAGS := tests LOCAL_MODULE_TAGS := tests
LOCAL_MODULE_TARGET_ARCH := arm x86 mips
include $(BUILD_EXECUTABLE) include $(BUILD_EXECUTABLE)
# ----------------------------------------------------------------------------- # -----------------------------------------------------------------------------
@@ -106,4 +108,6 @@ LOCAL_MODULE := libwvdrmdrmplugin_hidl_test
LOCAL_MODULE_TAGS := tests LOCAL_MODULE_TAGS := tests
LOCAL_MODULE_TARGET_ARCH := arm x86 mips
include $(BUILD_EXECUTABLE) include $(BUILD_EXECUTABLE)

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

@@ -5,6 +5,8 @@ include $(CLEAR_VARS)
LOCAL_MODULE:=oemcrypto_test LOCAL_MODULE:=oemcrypto_test
LOCAL_MODULE_TAGS := tests LOCAL_MODULE_TAGS := tests
LOCAL_MODULE_TARGET_ARCH := arm x86 mips
include $(LOCAL_PATH)/common.mk include $(LOCAL_PATH)/common.mk
include $(BUILD_EXECUTABLE) include $(BUILD_EXECUTABLE)

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

@@ -38,6 +38,8 @@ LOCAL_MODULE_OWNER := widevine
LOCAL_PROPRIETARY_MODULE := true LOCAL_PROPRIETARY_MODULE := true
LOCAL_MODULE_TARGET_ARCH := arm x86 mips
include $(BUILD_EXECUTABLE) include $(BUILD_EXECUTABLE)
# ----------------------------------------------------------------------------- # -----------------------------------------------------------------------------
@@ -83,4 +85,6 @@ LOCAL_MODULE_OWNER := widevine
LOCAL_PROPRIETARY_MODULE := true LOCAL_PROPRIETARY_MODULE := true
LOCAL_MODULE_TARGET_ARCH := arm x86 mips
include $(BUILD_EXECUTABLE) include $(BUILD_EXECUTABLE)