Fix build.
Set BUILD_EMULATOR to true when HOST_OS is linux.
Disable the emulator package target if BUILD_EMULATOR is not true.
Change-Id: I8987c0a091622baa0e861b451e635c4ddb148b29
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..fb92027 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)
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)