diff options
| author | The Android Open Source Project <initial-contribution@android.com> | 2010-07-13 10:04:40 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-07-13 10:04:40 -0700 |
| commit | 340d3b96a409aa6e941d3b013dbfbb7e9b548994 (patch) | |
| tree | cb5db8e920478006ea00ea2a70b7d31ea31c4153 | |
| parent | 0f8e72a03dc50f6d6b81aa87803ea558fe4f7b6c (diff) | |
| parent | 144f2f68bbef4e0988f2bf1d4ed7e4b9b227b771 (diff) | |
| download | omap3-340d3b96a409aa6e941d3b013dbfbb7e9b548994.tar.gz | |
am 144f2f68: merge from open-source master
Merge commit '144f2f68bbef4e0988f2bf1d4ed7e4b9b227b771'
* commit '144f2f68bbef4e0988f2bf1d4ed7e4b9b227b771':
Fix broken build
| -rw-r--r-- | omx/audio/src/openmax_il/nbamr_dec/inc/OMX_AmrDecoder.h | 1 | ||||
| -rw-r--r-- | omx/core_plugin/omx_core_plugin/Android.mk | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/omx/audio/src/openmax_il/nbamr_dec/inc/OMX_AmrDecoder.h b/omx/audio/src/openmax_il/nbamr_dec/inc/OMX_AmrDecoder.h index f8b6fb0..67f5d86 100644 --- a/omx/audio/src/openmax_il/nbamr_dec/inc/OMX_AmrDecoder.h +++ b/omx/audio/src/openmax_il/nbamr_dec/inc/OMX_AmrDecoder.h @@ -46,6 +46,7 @@ #include <OMX_Component.h> #include <pthread.h> #include <OMX_TI_Debug.h> +#include <cutils/log.h> #ifdef RESOURCE_MANAGER_ENABLED #include <ResourceManagerProxyAPI.h> diff --git a/omx/core_plugin/omx_core_plugin/Android.mk b/omx/core_plugin/omx_core_plugin/Android.mk index 18a823d..3ab891f 100644 --- a/omx/core_plugin/omx_core_plugin/Android.mk +++ b/omx/core_plugin/omx_core_plugin/Android.mk @@ -34,7 +34,7 @@ LOCAL_ARM_MODE := arm LOCAL_C_INCLUDES := \ $(PV_INCLUDES) -LOCAL_SHARED_LIBRARIES := libOMX_Core +LOCAL_SHARED_LIBRARIES := libOMX_Core liblog -include $(PV_TOP)/Android_platform_extras.mk |