Fix build-qemu-android.sh build.emu-1.5-release

Change-Id: I445674c58d2686b18444699a65ed2bf605428d77

6 files changed, 24 insertions, 22 deletions

diff --git a/android-console.c b/android-console.c
index acc859f022..97b48a0ef4 100644
--- a/android-console.c
+++ b/android-console.c
@@ -16,7 +16,7 @@
  */
 
 #include "android-console.h"
-#include "android/globals.h"
+
 #include "monitor/monitor.h"
 #include "qemu/sockets.h"
 #include "net/slirp.h"
@@ -28,6 +28,9 @@
 #include "hmp.h"
 
 #ifdef USE_ANDROID_EMU
+
+#include "android/globals.h"
+
 typedef struct AndroidConsoleRec_ {
     // Interfaces to call into QEMU specific code.
     QAndroidBatteryAgent battery_agent;
@@ -857,7 +860,11 @@ void android_console_avd_status(Monitor* mon, const QDict* qdict) {
 }
 
 void android_console_avd_name(Monitor* mon, const QDict* qdict) {
+#ifdef USE_ANDROID_EMU
     monitor_printf(mon, "%s\n", android_hw->avd_name);
+#else
+    monitor_printf(mon, "%s\n", "android");
+#endif
     monitor_printf(mon, "OK\n");
 }
 
@@ -1181,6 +1188,7 @@ void android_console_cdma(Monitor* mon, const QDict* qdict) {
                    helptext ? "OK" : "KO: missing sub-command");
 }
 
+#ifdef USE_ANDROID_EMU
 static const struct {
     const char* name;
     const char* display;
@@ -1192,7 +1200,6 @@ static const struct {
           {"ruim", "Read subscription from RUIM", A_SUBSCRIPTION_RUIM},
 };
 
-#ifdef USE_ANDROID_EMU
 void android_console_cdma_ssource(Monitor* mon, const QDict* qdict) {
     char* args = (char*)qdict_get_try_str(qdict, "arg");
     int nn;
diff --git a/hw/input/goldfish_events.c b/hw/input/goldfish_events.c
index e41466af87..b8fc4e2ed7 100644
--- a/hw/input/goldfish_events.c
+++ b/hw/input/goldfish_events.c
@@ -14,8 +14,6 @@
  * GNU General Public License for more details.
  */
 
-#include "android/globals.h"  /* for android_hw */
-
 #include "hw/sysbus.h"
 #include "ui/input.h"
 #include "ui/console.h"
@@ -25,6 +23,7 @@
 #include "hw/input/goldfish_events.h"
 
 #if defined(USE_ANDROID_EMU)
+#include "android/globals.h"  /* for android_hw */
 #include "android-qemu2-glue/qemu-control-impl.h"
 #endif
 
@@ -1184,7 +1183,11 @@ static void gf_evdev_realize(DeviceState *dev, Error **errp)
         events_set_bit(s, EV_KEY, LINUX_KEY_CAMERA);
     }
 
+#if defined(USE_ANDROID_EMU)
     if (android_hw->hw_keyboard) {
+#else
+    {
+#endif
         /* since we want to implement Unicode reverse-mapping
          * allow any kind of key, even those not available on
          * the skin.
diff --git a/hw/misc/android_pipe.c b/hw/misc/android_pipe.c
index 3023f336f5..7fdfb49471 100644
--- a/hw/misc/android_pipe.c
+++ b/hw/misc/android_pipe.c
@@ -209,22 +209,22 @@ void android_pipe_free(void* pipe_) {
     free(pipe);
 }
 
-unsigned android_pipe_poll(void* pipe_) {
+static unsigned android_pipe_poll(void* pipe_) {
     PipeInternal* pipe = pipe_;
     return pipe->funcs->poll(pipe->opaque);
 }
 
-int android_pipe_recv(void* pipe_, AndroidPipeBuffer* buffers, int numBuffers) {
+static int android_pipe_recv(void* pipe_, AndroidPipeBuffer* buffers, int numBuffers) {
     PipeInternal* pipe = pipe_;
     return pipe->funcs->recvBuffers(pipe->opaque, buffers, numBuffers);
 }
 
-int android_pipe_send(void* pipe_, const AndroidPipeBuffer* buffers, int numBuffers) {
+static int android_pipe_send(void* pipe_, const AndroidPipeBuffer* buffers, int numBuffers) {
     PipeInternal* pipe = pipe_;
     return pipe->funcs->sendBuffers(pipe->opaque, buffers, numBuffers);
 }
 
-void android_pipe_wake_on(void* pipe_, unsigned wakes) {
+static void android_pipe_wake_on(void* pipe_, unsigned wakes) {
     PipeInternal* pipe = pipe_;
     pipe->funcs->wakeOn(pipe->opaque, wakes);
 }
diff --git a/include/net/slirp.h b/include/net/slirp.h
index 4fb0b38b4d..eb12e6b6ea 100644
--- a/include/net/slirp.h
+++ b/include/net/slirp.h
@@ -47,7 +47,7 @@ void do_info_usernet(Monitor *mon, const QDict *qdict);
  */
 Slirp *net_slirp_lookup(const char *vlan, const char *stack, Error **errp);
 
-int net_slirp_is_inited();
+int net_slirp_is_inited(void);
 
 #endif
 
diff --git a/net/slirp.c b/net/slirp.c
index 984af5b46f..35f3775106 100644
--- a/net/slirp.c
+++ b/net/slirp.c
@@ -37,7 +37,7 @@
 #include "slirp/libslirp.h"
 #include "sysemu/char.h"
 
-#if defined(USE_ANDROID_EMU)
+#if defined(CONFIG_ANDROID) && defined(USE_ANDROID_EMU)
 #include "android/shaper.h"
 #include "android-qemu2-glue/net-android.h"
 #endif
@@ -106,7 +106,7 @@ static inline void slirp_smb_cleanup(SlirpState *s) { }
 
 void slirp_output(void *opaque, const uint8_t *pkt, int pkt_len)
 {
-#ifdef CONFIG_ANDROID
+#if defined(CONFIG_ANDROID) && defined(USE_ANDROID_EMU)
     netshaper_send(slirp_shaper_out, (void*)pkt, pkt_len);
 #else
     SlirpState *s = opaque;
@@ -117,7 +117,7 @@ void slirp_output(void *opaque, const uint8_t *pkt, int pkt_len)
 
 static ssize_t net_slirp_receive(NetClientState *nc, const uint8_t *buf, size_t size)
 {
-#ifdef CONFIG_ANDROID
+#if defined(CONFIG_ANDROID) && defined(USE_ANDROID_EMU)
     netshaper_send(slirp_shaper_in, (char*)buf, size);
 #else
     SlirpState *s = DO_UPCAST(SlirpState, nc, nc);
@@ -280,7 +280,7 @@ static int net_slirp_init(NetClientState *peer, const char *model,
     }
 #endif
 
-#if defined(USE_ANDROID_EMU)
+#if defined(CONFIG_ANDROID) && defined(USE_ANDROID_EMU)
     slirp_init_shapers(s, &s->nc, s->slirp);
 #endif
 
diff --git a/vl.c b/vl.c
index f27661f85b..b1df2d0b4b 100755
--- a/vl.c
+++ b/vl.c
@@ -155,15 +155,7 @@ int android_display_bpp    = 32;
 static Looper* metrics_looper = NULL;
 /////////////////////////////////////////////////////////////
 
-#else  /* !USE_ANDROID_EMU */
-
-#include "hw/misc/android_boot_properties.h"
-
-static void boot_property_add(const char* name, const char* value) {
-    android_boot_property_add(name, value);
-}
-
-#endif  /* !USE_ANDROID_EMU */
+#endif  /* USE_ANDROID_EMU */
 
 #define  LCD_DENSITY_LDPI      120
 #define  LCD_DENSITY_MDPI      160