summaryrefslogtreecommitdiffstats
path: root/core/Makefile
diff options
context:
space:
mode:
authorYing Wang <wangying@google.com>2012-07-26 10:15:21 -0700
committerYing Wang <wangying@google.com>2012-07-27 09:57:36 -0700
commit7023f6179d09663b794cd113c5c57426a977a248 (patch)
tree6f6d44193b29342101eaed724ece0e80064fd9d2 /core/Makefile
parentc11b5efa3a20e2364dfffbfa205306b9bd2e538a (diff)
downloadbuild-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
Diffstat (limited to 'core/Makefile')
-rw-r--r--core/Makefile3
1 files changed, 2 insertions, 1 deletions
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)