resolved conflicts for merge of 084209e2 to klp-modular-dev-plus-aosp
Change-Id: Ibf80470cfcaf553335d07c6fb220f7e9ec81ed87
diff --git a/CleanSpec.mk b/CleanSpec.mk
index c0525ad..eb3b0b8 100644
--- a/CleanSpec.mk
+++ b/CleanSpec.mk
@@ -211,6 +211,10 @@
# 4.4.2
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/build.prop)
+# "L" and beyond.
+# 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
# ************************************************
diff --git a/core/combo/HOST_windows-x86.mk b/core/combo/HOST_windows-x86.mk
index 85bc1e0..2f27aa7 100644
--- a/core/combo/HOST_windows-x86.mk
+++ b/core/combo/HOST_windows-x86.mk
@@ -40,6 +40,10 @@
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)
diff --git a/core/product_config.mk b/core/product_config.mk
index 7a27426..11336d8 100644
--- a/core/product_config.mk
+++ b/core/product_config.mk
@@ -164,11 +164,13 @@
# 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.