Merge "Fix TARGET_PREBUILT_TAG so that get_build_var can retrieve the correct value across architectures"
diff --git a/core/Makefile b/core/Makefile
index 71b42a2..ce55de5 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -112,7 +112,7 @@
endef
BUILDINFO_SH := build/tools/buildinfo.sh
-$(INSTALLED_BUILD_PROP_TARGET): $(BUILDINFO_SH) $(INTERNAL_BUILD_ID_MAKEFILE) $(wildcard $(TARGET_DEVICE_DIR)/system.prop)
+$(INSTALLED_BUILD_PROP_TARGET): $(BUILDINFO_SH) $(INTERNAL_BUILD_ID_MAKEFILE) $(BUILD_SYSTEM)/version_defaults.mk $(wildcard $(TARGET_DEVICE_DIR)/system.prop)
@echo Target buildinfo: $@
@mkdir -p $(dir $@)
$(hide) TARGET_BUILD_TYPE="$(TARGET_BUILD_VARIANT)" \
@@ -623,6 +623,10 @@
mkyaffs2_extra_flags :=
endif
+ifneq ($(BOARD_NAND_SPARE_SIZE),)
+mkyaffs2_extra_flags += -s $(BOARD_NAND_SPARE_SIZE)
+endif
+
# -----------------------------------------------------------------
# system yaffs image
diff --git a/core/binary.mk b/core/binary.mk
index 2f0a243..452fbab 100644
--- a/core/binary.mk
+++ b/core/binary.mk
@@ -19,6 +19,12 @@
endif
###########################################################
+## Explicitly declare assembly-only __ASSEMBLY__ macro for
+## assembly source
+###########################################################
+LOCAL_ASFLAGS += -D__ASSEMBLY__
+
+###########################################################
## Define PRIVATE_ variables used by multiple module types
###########################################################
$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_NO_DEFAULT_COMPILER_FLAGS := \
diff --git a/core/combo/TARGET_linux-x86.mk b/core/combo/TARGET_linux-x86.mk
index 1477ae6..b3dd1d6 100644
--- a/core/combo/TARGET_linux-x86.mk
+++ b/core/combo/TARGET_linux-x86.mk
@@ -25,7 +25,9 @@
TARGET_GLOBAL_CFLAGS := $(HOST_GLOBAL_CFLAGS) -m32
TARGET_GLOBAL_LDFLAGS := $(HOST_GLOBAL_LDFLAGS) -m32 -lpthread
TARGET_NO_UNDEFINED_LDFLAGS := $(HOST_NO_UNDEFINED_LDFLAGS)
+ifeq ($(strip $(TARGET_ARCH_VARIANT)),)
TARGET_ARCH_VARIANT := x86
+endif
else #simulator
# Provide a default variant.
diff --git a/core/dumpvar.mk b/core/dumpvar.mk
index fa20ece..a4d2b32 100644
--- a/core/dumpvar.mk
+++ b/core/dumpvar.mk
@@ -69,6 +69,7 @@
$(info TARGET_BUILD_TYPE=$(TARGET_BUILD_TYPE))
$(info TARGET_BUILD_APPS=$(TARGET_BUILD_APPS))
$(info TARGET_ARCH=$(TARGET_ARCH))
+$(info TARGET_ARCH_VARIANT=$(TARGET_ARCH_VARIANT))
$(info HOST_ARCH=$(HOST_ARCH))
$(info HOST_OS=$(HOST_OS))
$(info HOST_BUILD_TYPE=$(HOST_BUILD_TYPE))
diff --git a/core/main.mk b/core/main.mk
index f761ba5..b1a54ef 100644
--- a/core/main.mk
+++ b/core/main.mk
@@ -31,10 +31,10 @@
#endif
# check for broken versions of make
-ifeq (0,$(shell expr $$(echo $(MAKE_VERSION) | sed "s/[^0-9\.].*//") \>= 3.81))
+ifeq (0,$(shell expr $$(echo $(MAKE_VERSION) | sed "s/[^0-9\.].*//") = 3.81))
$(warning ********************************************************************************)
$(warning * You are using version $(MAKE_VERSION) of make.)
-$(warning * You must upgrade to version 3.81 or greater.)
+$(warning * Android can only be built by version 3.81.)
$(warning * see http://source.android.com/source/download.html)
$(warning ********************************************************************************)
$(error stopping)
@@ -274,7 +274,7 @@
endif
# build the full stagefright library
-ifneq ($(strip BUILD_WITH_FULL_STAGEFRIGHT),)
+ifneq ($(strip $(BUILD_WITH_FULL_STAGEFRIGHT)),)
BUILD_WITH_FULL_STAGEFRIGHT := true
endif
@@ -414,9 +414,9 @@
sdk/apkbuilder \
sdk/ddms \
sdk/hierarchyviewer2 \
+ sdk/ide_common \
sdk/jarutils \
sdk/layoutlib_api \
- sdk/layoutlib_utils \
sdk/layoutopt \
sdk/ninepatch \
sdk/sdkstats \
diff --git a/libs/host/CopyFile.c b/libs/host/CopyFile.c
index 44c7c2b..3cbe34a 100644
--- a/libs/host/CopyFile.c
+++ b/libs/host/CopyFile.c
@@ -69,7 +69,7 @@
*/
static bool isHiresMtime(const struct stat* pSrcStat)
{
-#if defined(WIN32_EXE) || defined(USE_MINGW)
+#if defined(WIN32) || defined(USE_MINGW)
return 0;
#elif defined(MACOSX_RSRC)
return pSrcStat->st_mtimespec.tv_nsec > 0;