summaryrefslogtreecommitdiff
path: root/mm-video-v4l2/Android.mk
diff options
context:
space:
mode:
authorVinay Kalia <vkalia@codeaurora.org>2014-07-31 12:34:21 -0700
committerShalaj Jain <shalajj@codeaurora.org>2014-08-06 12:10:34 -0700
commit7c8ab489c6113baed54c066a5ea4dbf8a3b4a220 (patch)
tree9754109bb7e85325d1786ea56ee63a06255a6f0b /mm-video-v4l2/Android.mk
parent32590c334b7682448e180857d5d6b260502e7737 (diff)
downloadmedia-7c8ab489c6113baed54c066a5ea4dbf8a3b4a220.tar.gz
mm-video: common: Fix race conditions during compilation
The intermediate obj files for the source code files in common directory were being created in out directory under common location. Both libOmxVdec and libOmxVenc were referring to the obj files from this location. Since compilation of both Vdec and Venc can go in parallel, this results in a compile time race condition. Fix those by compiling common source files as a static library and including this library in vdec and venc. Change-Id: Ie03da79063f21e56c8fe078ac7078b963b2e0c34
Diffstat (limited to 'mm-video-v4l2/Android.mk')
-rw-r--r--mm-video-v4l2/Android.mk1
1 files changed, 1 insertions, 0 deletions
diff --git a/mm-video-v4l2/Android.mk b/mm-video-v4l2/Android.mk
index 4bda2e1f..487eb3e2 100644
--- a/mm-video-v4l2/Android.mk
+++ b/mm-video-v4l2/Android.mk
@@ -1,6 +1,7 @@
OMX_VIDEO_PATH := $(call my-dir)
include $(CLEAR_VARS)
+include $(OMX_VIDEO_PATH)/vidc/common/Android.mk
include $(OMX_VIDEO_PATH)/vidc/vdec/Android.mk
include $(OMX_VIDEO_PATH)/vidc/venc/Android.mk
include $(OMX_VIDEO_PATH)/vidc/test/Android.mk