commit c646f5e40ddda3d49b581ac0c78cf748b5dee74c
author Vladimir Chtchetkine <vchtchetkine@google.com> Sat Sep 03 15:17:13 2011 -0700
committer Vladimir Chtchetkine <vchtchetkine@google.com> Wed Sep 07 10:34:21 2011 -0700
tree 6787ec15abd61a9d5e337d1db8a1a8a27faaf15c
parent 1875d374acc7412b8b0aacaff073c8080d532924

Camera service skeleton

Skeleton that implements camera emulation service over QEMU pipe. More meat
will be added as the guest camera emulation develops.

This is a patch taken from approved AOSP commit that didn't go through
because of a merge conflict.

Change-Id: I6f0a2e42be4f5f0bd86d3dbf0c2a609e74b200c2

vl-android.c

diff --git a/vl-android.c b/vl-android.c
index 4c2a433..c02abd5 100644
--- a/vl-android.c
+++ b/vl-android.c
@@ -54,6 +54,7 @@
 #include "android/hw-kmsg.h"
 #include "android/hw-pipe-net.h"
 #include "android/hw-qemud.h"
+#include "android/camera/camera-service.h"
 #include "android/charmap.h"
 #include "android/globals.h"
 #include "android/utils/bufprint.h"
@@ -2618,6 +2619,7 @@
     boot_property_init_service();
     android_hw_control_init();
     android_net_pipes_init();
+    android_camera_service_init();
 
 #ifdef CONFIG_KVM
     /* By default, force auto-detection for kvm */