it\'s ics

Change-Id: Icb34388abb92d122d49651f5ba816cb15df1b857
3dsfr3ak · Dec 14, 2013 · 1667db8 · 1667db8
1 parent a095a0a
commit 1667db8
Show file tree

Hide file tree

Showing 3 changed files with 59 additions and 62 deletions.
diff --git a/libcamera/Android.mk b/libcamera/Android.mk
@@ -1,5 +1,3 @@
-ifeq ($(TARGET_BOOTLOADER_BOARD_NAME),sharp)
-
 LOCAL_PATH := $(call my-dir)
 
 ## Make libcamera
@@ -56,4 +54,3 @@ LOCAL_C_INCLUDES       += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include
 LOCAL_ADDITIONAL_DEPENDENCIES := $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr 
 
 include $(BUILD_SHARED_LIBRARY)
-endif
diff --git a/libcamera/QualcommCameraHardware.h b/libcamera/QualcommCameraHardware.h
@@ -198,7 +198,7 @@ struct fifo_node {
 void enqueue(struct fifo_queue *queue, struct fifo_node *node) {
 	struct fifo_node *cur_node=queue->node;
 	int i;
-	ALOGE("enqueue:%p(%d)\n", node, queue->num_of_frames);
+	LOGE("enqueue:%p(%d)\n", node, queue->num_of_frames);
 	node->next=NULL;
 	if(queue->num_of_frames==0) {
 		queue->num_of_frames++;
@@ -219,7 +219,7 @@ struct fifo_node *dequeue(struct fifo_queue *queue) {
 	if(queue->num_of_frames==0)
 		return NULL;
 	struct fifo_node *node=queue->node;
-	ALOGE("dequeue:%p(%d)\n", node, queue->num_of_frames);
+	LOGE("dequeue:%p(%d)\n", node, queue->num_of_frames);
 	queue->num_of_frames--;
 	queue->front=!!queue->num_of_frames;
 	queue->node=queue->node->next;