diff options
| author | Vladimir Chtchetkine <vchtchetkine@google.com> | 2011-09-03 15:17:13 -0700 |
|---|---|---|
| committer | Vladimir Chtchetkine <vchtchetkine@google.com> | 2011-09-07 10:34:21 -0700 |
| commit | c646f5e40ddda3d49b581ac0c78cf748b5dee74c (patch) | |
| tree | 6787ec15abd61a9d5e337d1db8a1a8a27faaf15c /vl-android.c | |
| parent | 1875d374acc7412b8b0aacaff073c8080d532924 (diff) | |
| download | external_qemu-c646f5e40ddda3d49b581ac0c78cf748b5dee74c.zip external_qemu-c646f5e40ddda3d49b581ac0c78cf748b5dee74c.tar.gz external_qemu-c646f5e40ddda3d49b581ac0c78cf748b5dee74c.tar.bz2 | |
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
Diffstat (limited to 'vl-android.c')
| -rw-r--r-- | vl-android.c | 2 |
1 files changed, 2 insertions, 0 deletions
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 @@ int main(int argc, char **argv, char **envp) 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 */ |