commit faa80ad5dc9ca983d6717c644fc7be79216bc42d
author Ying Wang <wangying@google.com> Fri May 03 11:00:02 2013 -0700
committer Ying Wang <wangying@google.com> Fri May 03 11:08:57 2013 -0700
tree d59ec49176d60f8b2a6b071b68d9289e40deb33f
parent 02907c29ff8283ebcf49a1b921f186e32e46fd07

Use libqcamera2_util to fix build race condition

Previously due to '../' in the source file paths,
the util cpp files got compiled twice and written to the same output
file:
.../SHARED_LIBRARIES/camera.msm8960_intermediates/../util/QCameraQueue.o
.../SHARED_LIBRARIES/camera.flo_intermediates/../util/QCameraQueue.o

Change-Id: I3589c9959d311e04a3921f9e88baeca2194be4c6

camera/QCamera2/HAL/Android.mk

diff --git a/camera/QCamera2/HAL/Android.mk b/camera/QCamera2/HAL/Android.mk
index 2ede2c8..51fea58 100644
--- a/camera/QCamera2/HAL/Android.mk
+++ b/camera/QCamera2/HAL/Android.mk
@@ -1,4 +1,4 @@
-LOCAL_PATH:= $(call my-dir)
+LOCAL_PATH := $(call my-dir)
 
 include $(CLEAR_VARS)
 
@@ -7,17 +7,15 @@
         QCamera2Hal.cpp \
         QCamera2HWI.cpp \
         QCameraMem.cpp \
-        ../util/QCameraQueue.cpp \
-        ../util/QCameraCmdThread.cpp \
         QCameraStateMachine.cpp \
         QCameraChannel.cpp \
         QCameraStream.cpp \
-	QCameraPostProc.cpp \
+        QCameraPostProc.cpp \
         QCamera2HWICallbacks.cpp \
         QCameraParameters.cpp \
         QCameraThermalAdapter.cpp
 
-LOCAL_CFLAGS = -Wall -Werror -DDEFAULT_ZSL_MODE_ON -DDEFAULT_DENOISE_MODE_ON
+LOCAL_CFLAGS := -Wall -Werror -DDEFAULT_ZSL_MODE_ON -DDEFAULT_DENOISE_MODE_ON
 #Debug logs are enabled
 #LOCAL_CFLAGS += -DDISABLE_DEBUG_LOG
 
@@ -30,6 +28,7 @@
         $(LOCAL_PATH)/../../mm-image-codec/qomx_core \
         $(LOCAL_PATH)/../util
 
+LOCAL_STATIC_LIBRARIES := libqcamera2_util
 LOCAL_SHARED_LIBRARIES := libcamera_client liblog libhardware libutils libcutils libdl
 LOCAL_SHARED_LIBRARIES += libmmcamera_interface libmmjpeg_interface
 
@@ -41,4 +40,3 @@
 include $(BUILD_SHARED_LIBRARY)
 
 #include $(LOCAL_PATH)/test/Android.mk
-

camera/QCamera2/HAL3/Android.mk

diff --git a/camera/QCamera2/HAL3/Android.mk b/camera/QCamera2/HAL3/Android.mk
index e141103..579bbde 100644
--- a/camera/QCamera2/HAL3/Android.mk
+++ b/camera/QCamera2/HAL3/Android.mk
@@ -1,4 +1,4 @@
-LOCAL_PATH:= $(call my-dir)
+LOCAL_PATH := $(call my-dir)
 
 include $(CLEAR_VARS)
 
@@ -10,8 +10,6 @@
         QCamera3Stream.cpp \
         QCamera3Channel.cpp \
         QCamera3PostProc.cpp \
-        ../util/QCameraCmdThread.cpp \
-        ../util/QCameraQueue.cpp
 
 #LOCAL_CFLAGS = -Wall -Werror
 LOCAL_CFLAGS := -Wall
@@ -30,6 +28,7 @@
         $(LOCAL_PATH)/../../mm-image-codec/qomx_core \
         $(LOCAL_PATH)/../util
 
+LOCAL_STATIC_LIBRARIES := libqcamera2_util
 LOCAL_SHARED_LIBRARIES := libcamera_client liblog libhardware libutils libcutils libdl
 LOCAL_SHARED_LIBRARIES += libmmcamera_interface libmmjpeg_interface libui libcamera_metadata
 
@@ -41,4 +40,3 @@
 include $(BUILD_SHARED_LIBRARY)
 
 #include $(LOCAL_PATH)/test/Android.mk
-

camera/QCamera2/util/Android.mk

diff --git a/camera/QCamera2/util/Android.mk b/camera/QCamera2/util/Android.mk
new file mode 100644
index 0000000..d957588
--- /dev/null
+++ b/camera/QCamera2/util/Android.mk
@@ -0,0 +1,16 @@
+LOCAL_PATH:= $(call my-dir)
+
+include $(CLEAR_VARS)
+
+LOCAL_MODULE := libqcamera2_util
+
+LOCAL_SRC_FILES := \
+        QCameraQueue.cpp \
+        QCameraCmdThread.cpp \
+
+LOCAL_CFLAGS := -Wall -Werror
+
+LOCAL_C_INCLUDES := \
+        $(LOCAL_PATH)/../stack/common \
+
+include $(BUILD_STATIC_LIBRARY)