Merge "definitions.mk: Don't use GCC '@' parameter"
diff --git a/CleanSpec.mk b/CleanSpec.mk
index 74ad978..6d81733 100644
--- a/CleanSpec.mk
+++ b/CleanSpec.mk
@@ -125,6 +125,8 @@
# Now we switched to build against Mac OS X SDK 10.6
$(call add-clean-step, rm -rf $(OUT_DIR)/host/darwin-x86/obj)
+$(call add-clean-step, rm -f $(OUT_DIR)/versions_checked.mk)
+
# ************************************************
# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST
# ************************************************
diff --git a/core/Makefile b/core/Makefile
index 1a2ca46..66520ed 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -1298,7 +1298,7 @@
# -----------------------------------------------------------------
# The emulator package
-
+ifeq ($(BUILD_EMULATOR),true)
INTERNAL_EMULATOR_PACKAGE_FILES += \
$(HOST_OUT_EXECUTABLES)/emulator$(HOST_EXECUTABLE_SUFFIX) \
prebuilts/qemu-kernel/$(TARGET_ARCH)/kernel-qemu \
@@ -1314,6 +1314,7 @@
@echo "Package: $@"
$(hide) zip -qj $@ $(INTERNAL_EMULATOR_PACKAGE_FILES)
+endif
# -----------------------------------------------------------------
# Old PDK stuffs, retired
# The pdk package (Platform Development Kit)
@@ -1488,6 +1489,7 @@
# These are some additional build tasks that need to be run.
include $(sort $(wildcard $(BUILD_SYSTEM)/tasks/*.mk))
-include $(sort $(wildcard vendor/*/build/tasks/*.mk))
+-include $(sort $(wildcard device/*/build/tasks/*.mk))
# -----------------------------------------------------------------
# Create SDK repository packages. Must be done after tasks/* since
diff --git a/core/main.mk b/core/main.mk
index d0b277c..6516fa6 100644
--- a/core/main.mk
+++ b/core/main.mk
@@ -187,7 +187,9 @@
ifeq ($(strip $(wildcard $(MACOSX_SDK))),)
BUILD_EMULATOR := false
endif
-endif
+else # HOST_OS is not darwin
+ BUILD_EMULATOR := true
+endif # HOST_OS is darwin
$(shell echo 'VERSIONS_CHECKED := $(VERSION_CHECK_SEQUENCE_NUMBER)' \
> $(OUT_DIR)/versions_checked.mk)
diff --git a/target/product/core.mk b/target/product/core.mk
index 8cf3b3e..c7ae51c 100644
--- a/target/product/core.mk
+++ b/target/product/core.mk
@@ -122,6 +122,9 @@
uiautomator \
telephony-common \
mms-common \
+ zoneinfo.dat \
+ zoneinfo.idx \
+ zoneinfo.version
PRODUCT_COPY_FILES += \
system/core/rootdir/init.usb.rc:root/init.usb.rc \
@@ -140,5 +143,8 @@
libjavacore \
libssl \
libz-host \
- dalvik
+ dalvik \
+ zoneinfo-host.dat \
+ zoneinfo-host.idx \
+ zoneinfo-host.version
endif