From 694b2b7b124eb1c69c9e3277fdb4b714a8084841 Mon Sep 17 00:00:00 2001
From: Ian Rogers <irogers@google.com>
Date: Wed, 29 Jan 2014 21:37:37 -0800
Subject: [PATCH 1/3] Define __STDC_FORMAT_MACROS on Windows host builds.

Change-Id: I89b54a63c3f111b8242fe9e813d94a839c484195
---
 core/combo/HOST_windows-x86.mk | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/core/combo/HOST_windows-x86.mk b/core/combo/HOST_windows-x86.mk
index 85bc1e07b0..2f27aa75dd 100644
--- a/core/combo/HOST_windows-x86.mk
+++ b/core/combo/HOST_windows-x86.mk
@@ -40,6 +40,10 @@ endif # BUILD_HOST_64bit
 endif # USE_MINGW
 endif # Linux
 
+# Workaround differences in inttypes.h between host and target.
+# See bug 12708004.
+HOST_GLOBAL_CFLAGS += -D__STDC_FORMAT_MACROS
+
 HOST_CC := $(TOOLS_PREFIX)gcc$(TOOLS_EXE_SUFFIX)
 HOST_CXX := $(TOOLS_PREFIX)g++$(TOOLS_EXE_SUFFIX)
 HOST_AR := $(TOOLS_PREFIX)ar$(TOOLS_EXE_SUFFIX)

From d206afecb87d43bf216edd41bec308a6861e0711 Mon Sep 17 00:00:00 2001
From: Ian Rogers <irogers@google.com>
Date: Thu, 30 Jan 2014 08:47:53 -0800
Subject: [PATCH 2/3] Disable WITH_HOST_DALVIK on 64bit host builds.

Change-Id: I8cea32fe5541c3223e7f317245aab3061e8ad444
---
 core/product_config.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/core/product_config.mk b/core/product_config.mk
index 7a27426d71..11336d8f06 100644
--- a/core/product_config.mk
+++ b/core/product_config.mk
@@ -164,11 +164,13 @@ endif # unbundled_goals
 
 # Default to building dalvikvm on hosts that support it...
 ifeq ($(HOST_OS),linux)
+ifeq ($(BUILD_HOST_64bit),)
 # ... or if the if the option is already set
 ifeq ($(WITH_HOST_DALVIK),)
   WITH_HOST_DALVIK := true
 endif
 endif
+endif
 
 # ---------------------------------------------------------------
 # Include the product definitions.

From 6acec48274d603e0a4be7466aa206a5dcaae93ae Mon Sep 17 00:00:00 2001
From: Brian Carlstrom <bdc@google.com>
Date: Thu, 30 Jan 2014 11:11:38 -0800
Subject: [PATCH 3/3] CleanSpec for 08d410f53249c18d752f56a881ed2335403080d4:
 Make libart the default runtime

Change-Id: Id632beeb2f96dd4502ac4a6c03bab5e4252137ff
---
 CleanSpec.mk | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/CleanSpec.mk b/CleanSpec.mk
index c91249738b..f4f79cfdce 100644
--- a/CleanSpec.mk
+++ b/CleanSpec.mk
@@ -208,6 +208,9 @@ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/APPS/*)
 # 4.4.1
 $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/build.prop)
 
+# Make libart the default runtime
+$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/build.prop)
+
 # ************************************************
 # NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST
 # ************************************************