Android buildfixing

Android.mk

@@ -62,7 +62,6 @@ LOCAL_SRC_FILES :=\
     image/png_load.cpp \
     ui/view.cpp \
     ui/viewgroup.cpp \
-    ui/drawing.cpp \
     ui/ui.cpp \
     ui/ui_context.cpp \
     ui/screen.cpp \
@@ -71,7 +70,7 @@ LOCAL_SRC_FILES :=\
     util/text/utf8.cpp
 
 LOCAL_CFLAGS := -O3 -DGL_GLEXT_PROTOTYPES -DUSING_GLES2 -fsigned-char -fno-strict-aliasing
-LOCAL_CPPFLAGS := -fno-exceptions -std=gnu++11
+LOCAL_CPPFLAGS := -fno-exceptions -std=gnu++11 -frtti
 LOCAL_LDLIBS := -lz
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/ext/libzip
 

base/buffer.h

@@ -20,7 +20,7 @@ class Buffer {
   char *Append(size_t length) { return Append((ssize_t)length); }
 
   // These work pretty much like you'd expect.
-  void Append(const char *str);  // str null-terminated. The null is not copied.
+	void Append(const char *str);  // str null-terminated. The null is not copied.
   void Append(const std::string &str);
 
   // Various types. Useful for varz etc. Appends a string representation of the

image/zim_load.h

@@ -48,4 +48,4 @@ enum {
 // Watch out! If the image has mipmaps, multiple values will be written
 // to width, height, and image, as if they were arrays, up to 12 (max texture size is 4096 which is 2^12).
 int LoadZIM(const char *filename, int *width, int *height, int *flags, uint8_t **image);
-int LoadZIMPtr(char *zim, int datasize, int *width, int *height, int *flags, uint8_t **image);
+int LoadZIMPtr(char *zim, int datasize, int *width, int *height, int *flags, uint8_t **image);

net/http_client.cpp

@@ -183,7 +183,6 @@ Download::~Download() {
 
 }
 
-
 void Download::Do() {
 	Url fileUrl(url_);
 	if (!fileUrl.Valid()) {

net/http_client.h

@@ -1,6 +1,7 @@
 #ifndef _NET_HTTP_HTTP_CLIENT
 #define _NET_HTTP_HTTP_CLIENT
 
+#include <memory>
 #include "base/basictypes.h"
 #include "base/buffer.h"
 #include "thread/thread.h"

ui/view.h

@@ -7,6 +7,7 @@
 // Works very similarly to Android, there's a Measure pass and a Layout pass which you don't
 // really need to care about if you just use the standard containers and widgets.
 
+#include <string>
 #include <vector>
 #include <functional>
 #include <cmath>