commit 2910f183ddd5286911bc1e3499ea93cb57de8b75
author David 'Digit' Turner <digit@android.com> Mon May 10 18:48:35 2010 -0700
committer David 'Digit' Turner <digit@android.com> Tue May 11 17:10:19 2010 -0700
tree 43cfd4b9a6697496732722ff7f2fb66d5782597c
parent 0119362f0d74ca74f3ea743f6e0e527a9edcc474

Upstream: Misc integration - includes qobject.h and related sources

Change-Id: Idfa93ab5c67c95a3bc1869eeaf3a84a75fe24cd6

Makefile.android

diff --git a/Makefile.android b/Makefile.android
index 62dc2fe..598b430 100644
--- a/Makefile.android
+++ b/Makefile.android
@@ -49,7 +49,7 @@
 endif
 
 ifeq ($(HOST_OS),darwin)
-    MY_CFLAGS += -mdynamic-no-pic -fno-exceptions
+    MY_CFLAGS += -mdynamic-no-pic
 
     # When building on Leopard or above, we need to use the 10.4 SDK
     # or the generated binary will not run on Tiger.
@@ -575,6 +575,16 @@
               bt-host.c \
               bt-vhci.c \
               module.c \
+              json-lexer.c \
+              json-parser.c \
+              json-streamer.c \
+              qbool.c \
+              qdict.c \
+              qfloat.c \
+              qint.c \
+              qjson.c \
+              qlist.c \
+              qstring.c \
               android/boot-properties.c \
               android/charmap.c \
               android/cmdline-option.c \