am 468432c0: Include the framework copy of the OpenMAX headers instead of referencing external/opencore.
Merge commit '468432c09856425b72214e2b6682800bf17f5b22' into gingerbread-plus-aosp
* commit '468432c09856425b72214e2b6682800bf17f5b22':
Include the framework copy of the OpenMAX headers instead of referencing external/opencore.
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_C_INCLUDES := \
$(PV_INCLUDES)
-LOCAL_SHARED_LIBRARIES := libOMX_Core
+LOCAL_SHARED_LIBRARIES := libOMX_Core liblog
-include $(PV_TOP)/Android_platform_extras.mk
