Move Android.mks to their parent dir.
So we don't need "../" to reference source files in the common/
directory.
"../" in LOCAL_SRC_FILES causes build race condition: the path of object
file of ../common/src/extra_data_handler.cpp in vdec actually is the
same
as the path of object file of ../common/src/extra_data_handler.cpp in
venc.
Bug: 12779537
Change-Id: I42bf0471451316dc61f5fafdde5bb1cf1f0218c3
(cherry picked from commit d919cadbcaabc6295c1096c0fa7fa33207fb13d2)
diff --git a/mm-video-legacy/Android.mk b/mm-video-legacy/Android.mk
index 5fbfa4d..a3e795c 100755
--- a/mm-video-legacy/Android.mk
+++ b/mm-video-legacy/Android.mk
@@ -2,7 +2,6 @@
OMX_VIDEO_PATH := $(call my-dir)
include $(CLEAR_VARS)
-include $(OMX_VIDEO_PATH)/vidc/vdec/Android.mk
-include $(OMX_VIDEO_PATH)/vidc/venc/Android.mk
+include $(OMX_VIDEO_PATH)/vidc/Android.mk
include $(OMX_VIDEO_PATH)/DivxDrmDecrypt/Android.mk
endif
diff --git a/mm-video-legacy/vidc/Android.mk b/mm-video-legacy/vidc/Android.mk
new file mode 100644
index 0000000..b2294aa
--- /dev/null
+++ b/mm-video-legacy/vidc/Android.mk
@@ -0,0 +1,3 @@
+LOCAL_PATH := $(call my-dir)
+
+include $(LOCAL_PATH)/vdec.mk $(LOCAL_PATH)/venc.mk
diff --git a/mm-video-legacy/vidc/vdec/Android.mk b/mm-video-legacy/vidc/vdec.mk
old mode 100755
new mode 100644
similarity index 86%
rename from mm-video-legacy/vidc/vdec/Android.mk
rename to mm-video-legacy/vidc/vdec.mk
index 1ac7287..0aeb3a3
--- a/mm-video-legacy/vidc/vdec/Android.mk
+++ b/mm-video-legacy/vidc/vdec.mk
@@ -53,7 +53,7 @@
libmm-vdec-inc := bionic/libc/include
libmm-vdec-inc += bionic/libstdc++/include
-libmm-vdec-inc += $(LOCAL_PATH)/inc
+libmm-vdec-inc += $(LOCAL_PATH)/vdec/inc
libmm-vdec-inc += $(OMX_VIDEO_PATH)/vidc/common/inc
libmm-vdec-inc += hardware/qcom/media/mm-core/inc
#DRM include - Interface which loads the DRM library
@@ -97,13 +97,13 @@
LOCAL_SHARED_LIBRARIES += libqservice
LOCAL_SHARED_LIBRARIES += libqdMetaData
-LOCAL_SRC_FILES := src/frameparser.cpp
-LOCAL_SRC_FILES += src/h264_utils.cpp
-LOCAL_SRC_FILES += src/ts_parser.cpp
-LOCAL_SRC_FILES += src/mp4_utils.cpp
-LOCAL_SRC_FILES += src/omx_vdec.cpp
-LOCAL_SRC_FILES += ../common/src/extra_data_handler.cpp
-LOCAL_SRC_FILES += ../common/src/vidc_color_converter.cpp
+LOCAL_SRC_FILES := vdec/src/frameparser.cpp
+LOCAL_SRC_FILES += vdec/src/h264_utils.cpp
+LOCAL_SRC_FILES += vdec/src/ts_parser.cpp
+LOCAL_SRC_FILES += vdec/src/mp4_utils.cpp
+LOCAL_SRC_FILES += vdec/src/omx_vdec.cpp
+LOCAL_SRC_FILES += common/src/extra_data_handler.cpp
+LOCAL_SRC_FILES += common/src/vidc_color_converter.cpp
include $(BUILD_SHARED_LIBRARY)
@@ -113,7 +113,7 @@
include $(CLEAR_VARS)
mm-vdec-test-inc := hardware/qcom/media/mm-core/inc
-mm-vdec-test-inc += $(LOCAL_PATH)/inc
+mm-vdec-test-inc += $(LOCAL_PATH)/vdec/inc
LOCAL_MODULE := mm-vdec-omx-test
LOCAL_MODULE_TAGS := optional
@@ -123,8 +123,8 @@
LOCAL_PRELINK_MODULE := false
LOCAL_SHARED_LIBRARIES := libutils liblog libOmxCore libOmxVdec libbinder
-LOCAL_SRC_FILES := src/queue.c
-LOCAL_SRC_FILES += test/omx_vdec_test.cpp
+LOCAL_SRC_FILES := vdec/src/queue.c
+LOCAL_SRC_FILES += vdec/test/omx_vdec_test.cpp
include $(BUILD_EXECUTABLE)
@@ -134,7 +134,7 @@
include $(CLEAR_VARS)
mm-vdec-drv-test-inc := hardware/qcom/media/mm-core/inc
-mm-vdec-drv-test-inc += $(LOCAL_PATH)/inc
+mm-vdec-drv-test-inc += $(LOCAL_PATH)/vdec/inc
LOCAL_MODULE := mm-video-driver-test
LOCAL_MODULE_TAGS := optional
@@ -142,8 +142,8 @@
LOCAL_C_INCLUDES := $(mm-vdec-drv-test-inc)
LOCAL_PRELINK_MODULE := false
-LOCAL_SRC_FILES := src/message_queue.c
-LOCAL_SRC_FILES += test/decoder_driver_test.c
+LOCAL_SRC_FILES := vdec/src/message_queue.c
+LOCAL_SRC_FILES += vdec/test/decoder_driver_test.c
include $(BUILD_EXECUTABLE)
diff --git a/mm-video-legacy/vidc/venc/Android.mk b/mm-video-legacy/vidc/venc.mk
old mode 100755
new mode 100644
similarity index 84%
rename from mm-video-legacy/vidc/venc/Android.mk
rename to mm-video-legacy/vidc/venc.mk
index 9f707ca..044b70c
--- a/mm-video-legacy/vidc/venc/Android.mk
+++ b/mm-video-legacy/vidc/venc.mk
@@ -44,7 +44,7 @@
libmm-venc-inc := bionic/libc/include
libmm-venc-inc += bionic/libstdc++/include
-libmm-venc-inc := $(LOCAL_PATH)/inc
+libmm-venc-inc := $(LOCAL_PATH)/venc/inc
libmm-venc-inc += $(OMX_VIDEO_PATH)/vidc/common/inc
libmm-venc-inc += hardware/qcom/media/mm-core/inc
libmm-venc-inc += hardware/qcom/media/libstagefrighthw
@@ -76,16 +76,16 @@
LOCAL_SHARED_LIBRARIES := liblog libutils libbinder libcutils \
libc2dcolorconvert libdl
-LOCAL_SRC_FILES := src/omx_video_base.cpp
-LOCAL_SRC_FILES += src/omx_video_encoder.cpp
+LOCAL_SRC_FILES := venc/src/omx_video_base.cpp
+LOCAL_SRC_FILES += venc/src/omx_video_encoder.cpp
ifeq ($(TARGET_BOARD_PLATFORM),msm8974)
-LOCAL_SRC_FILES += src/video_encoder_device_copper.cpp
+LOCAL_SRC_FILES += venc/src/video_encoder_device_copper.cpp
else
-LOCAL_SRC_FILES += src/video_encoder_device.cpp
+LOCAL_SRC_FILES += venc/src/video_encoder_device.cpp
endif
-LOCAL_SRC_FILES += ../common/src/extra_data_handler.cpp
+LOCAL_SRC_FILES += common/src/extra_data_handler.cpp
include $(BUILD_SHARED_LIBRARY)
@@ -96,7 +96,7 @@
include $(CLEAR_VARS)
mm-venc-test720p-inc := $(TARGET_OUT_HEADERS)/mm-core
-mm-venc-test720p-inc += $(LOCAL_PATH)/inc
+mm-venc-test720p-inc += $(LOCAL_PATH)/venc/inc
mm-venc-test720p-inc += $(OMX_VIDEO_PATH)/vidc/common/inc
mm-venc-test720p-inc += hardware/qcom/media/mm-core/inc
ifneq ($(filter msm8974 msm8x74,$(TARGET_BOARD_PLATFORM)),)
@@ -112,10 +112,10 @@
LOCAL_PRELINK_MODULE := false
LOCAL_SHARED_LIBRARIES := libmm-omxcore libOmxVenc libbinder
-LOCAL_SRC_FILES := test/venc_test.cpp
-LOCAL_SRC_FILES += test/camera_test.cpp
-LOCAL_SRC_FILES += test/venc_util.c
-LOCAL_SRC_FILES += test/fb_test.c
+LOCAL_SRC_FILES := venc/test/venc_test.cpp
+LOCAL_SRC_FILES += venc/test/camera_test.cpp
+LOCAL_SRC_FILES += venc/test/venc_util.c
+LOCAL_SRC_FILES += venc/test/fb_test.c
include $(BUILD_EXECUTABLE)
@@ -125,7 +125,7 @@
include $(CLEAR_VARS)
-venc-test-inc += $(LOCAL_PATH)/inc
+venc-test-inc += $(LOCAL_PATH)/venc/inc
LOCAL_MODULE := mm-video-encdrv-test
LOCAL_MODULE_TAGS := optional
@@ -134,8 +134,8 @@
LOCAL_PRELINK_MODULE := false
-LOCAL_SRC_FILES := test/video_encoder_test.c
-LOCAL_SRC_FILES += test/queue.c
+LOCAL_SRC_FILES := venc/test/video_encoder_test.c
+LOCAL_SRC_FILES += venc/test/queue.c
include $(BUILD_EXECUTABLE)
@@ -144,4 +144,3 @@
# ---------------------------------------------------------------------------------
# END
# ---------------------------------------------------------------------------------
-
