Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit db285e93 authored by Ram Mohan M's avatar Ram Mohan M Committed by android-build-merger
Browse files

Merge "omxvts: fix binary for 64bit platforms" into oc-mr1-dev 

am: 7e028640

Change-Id: Id7c88291d1e8d846deea702f1ae30198361333dd
parents d1817707 7e028640

media/omx/1.0/vts/functional/audio/VtsHalMediaOmxV1_0TargetAudioDecTest.cpp

+4 −0
Original line number Diff line number Diff line
@@ -15,6 +15,10 @@ 
 */



#define LOG_TAG "media_omx_hidl_audio_dec_test"

#ifdef __LP64__

#define OMX_ANDROID_COMPILE_AS_32BIT_ON_64BIT_PLATFORMS

#endif



#include <android-base/logging.h>



#include <android/hardware/media/omx/1.0/IOmx.h>

media/omx/1.0/vts/functional/audio/VtsHalMediaOmxV1_0TargetAudioEncTest.cpp

+4 −0
Original line number Diff line number Diff line
@@ -15,6 +15,10 @@ 
 */



#define LOG_TAG "media_omx_hidl_audio_enc_test"

#ifdef __LP64__

#define OMX_ANDROID_COMPILE_AS_32BIT_ON_64BIT_PLATFORMS

#endif



#include <android-base/logging.h>



#include <android/hardware/media/omx/1.0/IOmx.h>

media/omx/1.0/vts/functional/audio/media_audio_hidl_test_common.cpp

+4 −0
Original line number Diff line number Diff line
@@ -15,6 +15,10 @@ 
 */



#define LOG_TAG "media_omx_hidl_audio_test_common"

#ifdef __LP64__

#define OMX_ANDROID_COMPILE_AS_32BIT_ON_64BIT_PLATFORMS

#endif



#include <android-base/logging.h>



#include <android/hardware/media/omx/1.0/IOmx.h>

media/omx/1.0/vts/functional/common/media_hidl_test_common.cpp

+0 −1
Original line number Diff line number Diff line
@@ -15,7 +15,6 @@ 
 */



#define LOG_TAG "media_omx_hidl_video_test_common"



#ifdef __LP64__

#define OMX_ANDROID_COMPILE_AS_32BIT_ON_64BIT_PLATFORMS

#endif

media/omx/1.0/vts/functional/component/VtsHalMediaOmxV1_0TargetComponentTest.cpp

+4 −0
Original line number Diff line number Diff line
@@ -15,6 +15,10 @@ 
 */



#define LOG_TAG "media_omx_hidl_component_test"

#ifdef __LP64__

#define OMX_ANDROID_COMPILE_AS_32BIT_ON_64BIT_PLATFORMS

#endif



#include <android-base/logging.h>



#include <android/hardware/media/omx/1.0/IOmx.h>