commit 2a0e954ecf7c60e6ec62d64b9382cc4ee447e224
author Dan Albert <danalbert@google.com> Wed May 21 14:55:02 2014 -0700
committer Dan Albert <danalbert@google.com> Wed May 21 19:47:17 2014 -0700
tree 37d22f5d9e221ecd8a68c41d430e7b21fa3f54d1
parent 299d2a2b200a94daa49c4727fd679f4461c083c7

Move art host to libc++

Change-Id: Ia51a4fdfdbae7377130a43c401c2d8d241671d1e

compiler/Android.mk

diff --git a/compiler/Android.mk b/compiler/Android.mk
index cb900ea..e9010c9 100644
--- a/compiler/Android.mk
+++ b/compiler/Android.mk
@@ -194,8 +194,8 @@
   LOCAL_GENERATED_SOURCES += $$(ENUM_OPERATOR_OUT_GEN)
 
   LOCAL_CFLAGS := $$(LIBART_COMPILER_CFLAGS)
+  include external/libcxx/libcxx.mk
   ifeq ($$(art_target_or_host),target)
-    include external/libcxx/libcxx.mk
     LOCAL_CLANG := $(ART_TARGET_CLANG)
     LOCAL_CFLAGS += $(ART_TARGET_CFLAGS)
   else # host
@@ -247,7 +247,7 @@
   LOCAL_C_INCLUDES += $(ART_C_INCLUDES) art/runtime
 
   ifeq ($$(art_target_or_host),host)
-    LOCAL_LDLIBS := -ldl -lpthread
+    LOCAL_LDLIBS += -ldl -lpthread
   endif
   LOCAL_ADDITIONAL_DEPENDENCIES := art/build/Android.common.mk
   LOCAL_ADDITIONAL_DEPENDENCIES += $(LOCAL_PATH)/Android.mk

compiler/output_stream.h

diff --git a/compiler/output_stream.h b/compiler/output_stream.h
index 478a854..b5ac933 100644
--- a/compiler/output_stream.h
+++ b/compiler/output_stream.h
@@ -18,8 +18,8 @@
 #define ART_COMPILER_OUTPUT_STREAM_H_
 
 #include <stdint.h>
-
 #include <string>
+#include <sys/types.h>
 
 #include "base/macros.h"