[RESTRICT AUTOMERGE] Removed 64-bit media codec test binaries
The 64-bit codecs never actually run in practice, but test binaries were
being built for both ABIs in OC.
Bug: 72322539
Test: manual build
Change-Id: I07921e607e1998acb95b1ef6551d085af0be18c2
Merged-In: I52f9dda8e783592a0cc0dafbdd0368b10c12dcf0
diff --git a/common/host-side/tradefed/tests/src/com/android/compatibility/common/tradefed/presubmit/ValidateTestsAbi.java b/common/host-side/tradefed/tests/src/com/android/compatibility/common/tradefed/presubmit/ValidateTestsAbi.java
index ee28e64..0439fc4 100644
--- a/common/host-side/tradefed/tests/src/com/android/compatibility/common/tradefed/presubmit/ValidateTestsAbi.java
+++ b/common/host-side/tradefed/tests/src/com/android/compatibility/common/tradefed/presubmit/ValidateTestsAbi.java
@@ -64,6 +64,21 @@
* This binary is a host side helper, so we do not need to check it.
*/
BINARY_EXCEPTIONS.add("sepolicy-analyze");
+
+ /**
+ * This binary only exists in 32-bit.
+ */
+ BINARY_EXCEPTIONS.add("testavcdec32");
+
+ /**
+ * This binary only exists in 32-bit.
+ */
+ BINARY_EXCEPTIONS.add("testhevcdec32");
+
+ /**
+ * This binary only exists in 32-bit.
+ */
+ BINARY_EXCEPTIONS.add("testmpeg2dec32");
}
/**
diff --git a/hostsidetests/securitybulletin/securityPatch/avcdec/Android.mk b/hostsidetests/securitybulletin/securityPatch/avcdec/Android.mk
index 563edf2a..b625c4b 100644
--- a/hostsidetests/securitybulletin/securityPatch/avcdec/Android.mk
+++ b/hostsidetests/securitybulletin/securityPatch/avcdec/Android.mk
@@ -22,9 +22,8 @@
LOCAL_MODULE := testavcdec
LOCAL_SRC_FILES := ../../../../../external/libavc/test/decoder/main.c
-LOCAL_MULTILIB := both
+LOCAL_MULTILIB := 32
LOCAL_MODULE_STEM_32 := $(LOCAL_MODULE)32
-LOCAL_MODULE_STEM_64 := $(LOCAL_MODULE)64
LOCAL_C_INCLUDES := external/libavc/common
LOCAL_C_INCLUDES += external/libavc/decoder
LOCAL_SHARED_LIBRARIES := liblog
@@ -37,4 +36,4 @@
LOCAL_ARM_MODE := arm
LOCAL_CFLAGS += -Wall -Werror
LOCAL_CFLAGS += -DPROFILE_ENABLE -fPIC -DMD5_DISABLE
-include $(BUILD_CTS_EXECUTABLE)
\ No newline at end of file
+include $(BUILD_CTS_EXECUTABLE)
diff --git a/hostsidetests/securitybulletin/securityPatch/hevcdec/Android.mk b/hostsidetests/securitybulletin/securityPatch/hevcdec/Android.mk
index 3d069fa..5a188b9 100644
--- a/hostsidetests/securitybulletin/securityPatch/hevcdec/Android.mk
+++ b/hostsidetests/securitybulletin/securityPatch/hevcdec/Android.mk
@@ -24,9 +24,8 @@
LOCAL_MODULE := testhevcdec
LOCAL_SRC_FILES := ../../../../../external/libhevc/test/decoder/main.c
-LOCAL_MULTILIB := both
+LOCAL_MULTILIB := 32
LOCAL_MODULE_STEM_32 := $(LOCAL_MODULE)32
-LOCAL_MODULE_STEM_64 := $(LOCAL_MODULE)64
LOCAL_C_INCLUDES := external/libhevc/common
LOCAL_C_INCLUDES += external/libhevc/decoder
LOCAL_SHARED_LIBRARIES := liblog
@@ -39,4 +38,4 @@
LOCAL_ARM_MODE := arm
LOCAL_CFLAGS += -Wall -Werror
LOCAL_CFLAGS += -DPROFILE_ENABLE -fPIC -DMD5_DISABLE
-include $(BUILD_CTS_EXECUTABLE)
\ No newline at end of file
+include $(BUILD_CTS_EXECUTABLE)
diff --git a/hostsidetests/securitybulletin/securityPatch/mpeg2dec/Android.mk b/hostsidetests/securitybulletin/securityPatch/mpeg2dec/Android.mk
index f71b2fa..1696b43 100644
--- a/hostsidetests/securitybulletin/securityPatch/mpeg2dec/Android.mk
+++ b/hostsidetests/securitybulletin/securityPatch/mpeg2dec/Android.mk
@@ -24,9 +24,8 @@
LOCAL_MODULE := testmpeg2dec
LOCAL_SRC_FILES := ../../../../../external/libmpeg2/test/decoder/main.c
-LOCAL_MULTILIB := both
+LOCAL_MULTILIB := 32
LOCAL_MODULE_STEM_32 := $(LOCAL_MODULE)32
-LOCAL_MODULE_STEM_64 := $(LOCAL_MODULE)64
LOCAL_C_INCLUDES := external/libmpeg2/common
LOCAL_C_INCLUDES += external/libmpeg2/decoder
LOCAL_SHARED_LIBRARIES := liblog
@@ -39,4 +38,4 @@
LOCAL_ARM_MODE := arm
LOCAL_CFLAGS += -Wall -Werror
LOCAL_CFLAGS += -DPROFILE_ENABLE -fPIC -DMD5_DISABLE
-include $(BUILD_CTS_EXECUTABLE)
\ No newline at end of file
+include $(BUILD_CTS_EXECUTABLE)
