diff options
author | David 'Digit' Turner <digit@android.com> | 2011-04-29 05:35:37 -0700 |
---|---|---|
committer | Android Code Review <code-review@android.com> | 2011-04-29 05:35:37 -0700 |
commit | ec1d38fbb171c45fc8b79734efb80e2c21db6ef8 (patch) | |
tree | b6e89c99abae42e5bcef26afaa2952b5a870895b /vl-android.c | |
parent | f836b5aaab624b8ba5e221fc71cc140df27bbeb2 (diff) | |
parent | d4d688e926097faba7fd3717d1c0d3f296bdb526 (diff) | |
download | external_qemu-ec1d38fbb171c45fc8b79734efb80e2c21db6ef8.zip external_qemu-ec1d38fbb171c45fc8b79734efb80e2c21db6ef8.tar.gz external_qemu-ec1d38fbb171c45fc8b79734efb80e2c21db6ef8.tar.bz2 |
Merge "New goldfish_pipe virtual device."
Diffstat (limited to 'vl-android.c')
-rw-r--r-- | vl-android.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/vl-android.c b/vl-android.c index 1d730f5..6653286 100644 --- a/vl-android.c +++ b/vl-android.c @@ -52,7 +52,6 @@ #include "modem_driver.h" #include "android/gps.h" #include "android/hw-qemud.h" -#include "android/hw-qemud-pipe.h" #include "android/hw-kmsg.h" #include "android/charmap.h" #include "android/globals.h" @@ -64,6 +63,7 @@ #include "android/utils/tempfile.h" #include "android/display-core.h" #include "android/utils/timezone.h" +#include "android/pipe-net.h" #include "android/snapshot.h" #include "targphys.h" #include "tcpdump.h" @@ -4045,6 +4045,7 @@ int main(int argc, char **argv, char **envp) /* Initialize boot properties. */ boot_property_init_service(); android_hw_control_init(); + android_net_pipes_init(); optind = 1; for(;;) { @@ -5175,7 +5176,7 @@ int main(int argc, char **argv, char **envp) } /* Initialize OpenGLES emulation */ - android_hw_opengles_init(); + //android_hw_opengles_init(); if (android_op_cpu_delay) { char* end; |