diff options
author | Ram Mohan M | 2017-09-27 10:23:22 -0500 |
---|---|---|
committer | Pawin Vongmasa | 2017-09-29 06:41:41 -0500 |
commit | 9502b237f735d85341b20f7421ad196b14b476a9 (patch) | |
tree | 409c05bbfc4548ebd23a4d1d8ae524e087a532ae /media/omx/1.0 | |
parent | 028540b3a16421a5dcf5a0277820464423e0d675 (diff) | |
download | platform-hardware-interfaces-9502b237f735d85341b20f7421ad196b14b476a9.tar.gz platform-hardware-interfaces-9502b237f735d85341b20f7421ad196b14b476a9.tar.xz platform-hardware-interfaces-9502b237f735d85341b20f7421ad196b14b476a9.zip |
omxvts: fix binary for 64bit platforms
Bug: 63796949
Change-Id: Ieddae0bd9fc45a88c6e1579bdd588b77b4174a1f
Diffstat (limited to 'media/omx/1.0')
8 files changed, 24 insertions, 2 deletions
diff --git a/media/omx/1.0/vts/functional/audio/VtsHalMediaOmxV1_0TargetAudioDecTest.cpp b/media/omx/1.0/vts/functional/audio/VtsHalMediaOmxV1_0TargetAudioDecTest.cpp index b8a16344..11614449 100644 --- a/media/omx/1.0/vts/functional/audio/VtsHalMediaOmxV1_0TargetAudioDecTest.cpp +++ b/media/omx/1.0/vts/functional/audio/VtsHalMediaOmxV1_0TargetAudioDecTest.cpp | |||
@@ -15,6 +15,10 @@ | |||
15 | */ | 15 | */ |
16 | 16 | ||
17 | #define LOG_TAG "media_omx_hidl_audio_dec_test" | 17 | #define LOG_TAG "media_omx_hidl_audio_dec_test" |
18 | #ifdef __LP64__ | ||
19 | #define OMX_ANDROID_COMPILE_AS_32BIT_ON_64BIT_PLATFORMS | ||
20 | #endif | ||
21 | |||
18 | #include <android-base/logging.h> | 22 | #include <android-base/logging.h> |
19 | 23 | ||
20 | #include <android/hardware/media/omx/1.0/IOmx.h> | 24 | #include <android/hardware/media/omx/1.0/IOmx.h> |
diff --git a/media/omx/1.0/vts/functional/audio/VtsHalMediaOmxV1_0TargetAudioEncTest.cpp b/media/omx/1.0/vts/functional/audio/VtsHalMediaOmxV1_0TargetAudioEncTest.cpp index dd5f16af..66c46371 100644 --- a/media/omx/1.0/vts/functional/audio/VtsHalMediaOmxV1_0TargetAudioEncTest.cpp +++ b/media/omx/1.0/vts/functional/audio/VtsHalMediaOmxV1_0TargetAudioEncTest.cpp | |||
@@ -15,6 +15,10 @@ | |||
15 | */ | 15 | */ |
16 | 16 | ||
17 | #define LOG_TAG "media_omx_hidl_audio_enc_test" | 17 | #define LOG_TAG "media_omx_hidl_audio_enc_test" |
18 | #ifdef __LP64__ | ||
19 | #define OMX_ANDROID_COMPILE_AS_32BIT_ON_64BIT_PLATFORMS | ||
20 | #endif | ||
21 | |||
18 | #include <android-base/logging.h> | 22 | #include <android-base/logging.h> |
19 | 23 | ||
20 | #include <android/hardware/media/omx/1.0/IOmx.h> | 24 | #include <android/hardware/media/omx/1.0/IOmx.h> |
diff --git a/media/omx/1.0/vts/functional/audio/media_audio_hidl_test_common.cpp b/media/omx/1.0/vts/functional/audio/media_audio_hidl_test_common.cpp index 4c68219b..9500094d 100644 --- a/media/omx/1.0/vts/functional/audio/media_audio_hidl_test_common.cpp +++ b/media/omx/1.0/vts/functional/audio/media_audio_hidl_test_common.cpp | |||
@@ -15,6 +15,10 @@ | |||
15 | */ | 15 | */ |
16 | 16 | ||
17 | #define LOG_TAG "media_omx_hidl_audio_test_common" | 17 | #define LOG_TAG "media_omx_hidl_audio_test_common" |
18 | #ifdef __LP64__ | ||
19 | #define OMX_ANDROID_COMPILE_AS_32BIT_ON_64BIT_PLATFORMS | ||
20 | #endif | ||
21 | |||
18 | #include <android-base/logging.h> | 22 | #include <android-base/logging.h> |
19 | 23 | ||
20 | #include <android/hardware/media/omx/1.0/IOmx.h> | 24 | #include <android/hardware/media/omx/1.0/IOmx.h> |
diff --git a/media/omx/1.0/vts/functional/common/media_hidl_test_common.cpp b/media/omx/1.0/vts/functional/common/media_hidl_test_common.cpp index 9eab10c7..28616e21 100644 --- a/media/omx/1.0/vts/functional/common/media_hidl_test_common.cpp +++ b/media/omx/1.0/vts/functional/common/media_hidl_test_common.cpp | |||
@@ -15,7 +15,6 @@ | |||
15 | */ | 15 | */ |
16 | 16 | ||
17 | #define LOG_TAG "media_omx_hidl_video_test_common" | 17 | #define LOG_TAG "media_omx_hidl_video_test_common" |
18 | |||
19 | #ifdef __LP64__ | 18 | #ifdef __LP64__ |
20 | #define OMX_ANDROID_COMPILE_AS_32BIT_ON_64BIT_PLATFORMS | 19 | #define OMX_ANDROID_COMPILE_AS_32BIT_ON_64BIT_PLATFORMS |
21 | #endif | 20 | #endif |
diff --git a/media/omx/1.0/vts/functional/component/VtsHalMediaOmxV1_0TargetComponentTest.cpp b/media/omx/1.0/vts/functional/component/VtsHalMediaOmxV1_0TargetComponentTest.cpp index d7c731fa..5d0ac35e 100644 --- a/media/omx/1.0/vts/functional/component/VtsHalMediaOmxV1_0TargetComponentTest.cpp +++ b/media/omx/1.0/vts/functional/component/VtsHalMediaOmxV1_0TargetComponentTest.cpp | |||
@@ -15,6 +15,10 @@ | |||
15 | */ | 15 | */ |
16 | 16 | ||
17 | #define LOG_TAG "media_omx_hidl_component_test" | 17 | #define LOG_TAG "media_omx_hidl_component_test" |
18 | #ifdef __LP64__ | ||
19 | #define OMX_ANDROID_COMPILE_AS_32BIT_ON_64BIT_PLATFORMS | ||
20 | #endif | ||
21 | |||
18 | #include <android-base/logging.h> | 22 | #include <android-base/logging.h> |
19 | 23 | ||
20 | #include <android/hardware/media/omx/1.0/IOmx.h> | 24 | #include <android/hardware/media/omx/1.0/IOmx.h> |
diff --git a/media/omx/1.0/vts/functional/master/VtsHalMediaOmxV1_0TargetMasterTest.cpp b/media/omx/1.0/vts/functional/master/VtsHalMediaOmxV1_0TargetMasterTest.cpp index e8f5f77d..7cffea8c 100644 --- a/media/omx/1.0/vts/functional/master/VtsHalMediaOmxV1_0TargetMasterTest.cpp +++ b/media/omx/1.0/vts/functional/master/VtsHalMediaOmxV1_0TargetMasterTest.cpp | |||
@@ -15,6 +15,10 @@ | |||
15 | */ | 15 | */ |
16 | 16 | ||
17 | #define LOG_TAG "media_omx_hidl_master_test" | 17 | #define LOG_TAG "media_omx_hidl_master_test" |
18 | #ifdef __LP64__ | ||
19 | #define OMX_ANDROID_COMPILE_AS_32BIT_ON_64BIT_PLATFORMS | ||
20 | #endif | ||
21 | |||
18 | #include <android-base/logging.h> | 22 | #include <android-base/logging.h> |
19 | 23 | ||
20 | #include <android/hardware/media/omx/1.0/IOmx.h> | 24 | #include <android/hardware/media/omx/1.0/IOmx.h> |
diff --git a/media/omx/1.0/vts/functional/video/VtsHalMediaOmxV1_0TargetVideoDecTest.cpp b/media/omx/1.0/vts/functional/video/VtsHalMediaOmxV1_0TargetVideoDecTest.cpp index 6b012858..a2547e89 100644 --- a/media/omx/1.0/vts/functional/video/VtsHalMediaOmxV1_0TargetVideoDecTest.cpp +++ b/media/omx/1.0/vts/functional/video/VtsHalMediaOmxV1_0TargetVideoDecTest.cpp | |||
@@ -15,6 +15,10 @@ | |||
15 | */ | 15 | */ |
16 | 16 | ||
17 | #define LOG_TAG "media_omx_hidl_video_dec_test" | 17 | #define LOG_TAG "media_omx_hidl_video_dec_test" |
18 | #ifdef __LP64__ | ||
19 | #define OMX_ANDROID_COMPILE_AS_32BIT_ON_64BIT_PLATFORMS | ||
20 | #endif | ||
21 | |||
18 | #include <android-base/logging.h> | 22 | #include <android-base/logging.h> |
19 | 23 | ||
20 | #include <android/hardware/media/omx/1.0/IOmx.h> | 24 | #include <android/hardware/media/omx/1.0/IOmx.h> |
diff --git a/media/omx/1.0/vts/functional/video/media_video_hidl_test_common.cpp b/media/omx/1.0/vts/functional/video/media_video_hidl_test_common.cpp index 91aecf22..e1b6022f 100644 --- a/media/omx/1.0/vts/functional/video/media_video_hidl_test_common.cpp +++ b/media/omx/1.0/vts/functional/video/media_video_hidl_test_common.cpp | |||
@@ -15,7 +15,6 @@ | |||
15 | */ | 15 | */ |
16 | 16 | ||
17 | #define LOG_TAG "media_omx_hidl_video_test_common" | 17 | #define LOG_TAG "media_omx_hidl_video_test_common" |
18 | |||
19 | #ifdef __LP64__ | 18 | #ifdef __LP64__ |
20 | #define OMX_ANDROID_COMPILE_AS_32BIT_ON_64BIT_PLATFORMS | 19 | #define OMX_ANDROID_COMPILE_AS_32BIT_ON_64BIT_PLATFORMS |
21 | #endif | 20 | #endif |