diff options
| author | Ying Wang <wangying@google.com> | 2012-07-26 10:15:21 -0700 |
|---|---|---|
| committer | Ying Wang <wangying@google.com> | 2012-07-27 09:57:36 -0700 |
| commit | 7023f6179d09663b794cd113c5c57426a977a248 (patch) | |
| tree | 6f6d44193b29342101eaed724ece0e80064fd9d2 | |
| parent | c11b5efa3a20e2364dfffbfa205306b9bd2e538a (diff) | |
| download | build-7023f6179d09663b794cd113c5c57426a977a248.zip build-7023f6179d09663b794cd113c5c57426a977a248.tar.gz build-7023f6179d09663b794cd113c5c57426a977a248.tar.bz2 | |
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
| -rw-r--r-- | CleanSpec.mk | 2 | ||||
| -rw-r--r-- | core/Makefile | 3 | ||||
| -rw-r--r-- | core/main.mk | 4 |
3 files changed, 7 insertions, 2 deletions
diff --git a/CleanSpec.mk b/CleanSpec.mk index 74ad978..6d81733 100644 --- a/CleanSpec.mk +++ b/CleanSpec.mk @@ -125,6 +125,8 @@ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/build.prop) # 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 @@ dalvikfiles: $(INTERNAL_DALVIK_MODULES) # ----------------------------------------------------------------- # 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 @@ $(INTERNAL_EMULATOR_PACKAGE_TARGET): $(INTERNAL_EMULATOR_PACKAGE_FILES) @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 @@ MACOSX_SDK := /Developer/SDKs/MacOSX$(MSDK).sdk 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) |