diff options
| author | Raphael Moll <ralf@android.com> | 2014-05-05 17:49:24 -0700 |
|---|---|---|
| committer | Raphael Moll <ralf@android.com> | 2014-05-05 19:02:44 -0700 |
| commit | bc9821bf519650706af2970511d7d9d5d555d678 (patch) | |
| tree | faa312ef4dacaa0bb7e97efb90e54e78d5748230 | |
| parent | 8abfaf6731da88ad045205e612c56123c80dd4a4 (diff) | |
| download | build-bc9821bf519650706af2970511d7d9d5d555d678.tar.gz | |
Temporarily disable emulator build on MacOS X.
Change-Id: I3740de7ef41520f6079a1dc48910e39e64f4a8b2
| -rw-r--r-- | core/combo/HOST_darwin-x86.mk | 2 | ||||
| -rw-r--r-- | target/product/emulator.mk | 9 |
2 files changed, 10 insertions, 1 deletions
diff --git a/core/combo/HOST_darwin-x86.mk b/core/combo/HOST_darwin-x86.mk index b819f36cb3..c402c2ab88 100644 --- a/core/combo/HOST_darwin-x86.mk +++ b/core/combo/HOST_darwin-x86.mk @@ -163,4 +163,4 @@ endef # gcc location for clang; to be updated when clang is updated # HOST_TOOLCHAIN_ROOT is a Darwin-specific define -HOST_TOOLCHAIN_FOR_CLANG := $(HOST_TOOLCHAIN_ROOT)
\ No newline at end of file +HOST_TOOLCHAIN_FOR_CLANG := $(HOST_TOOLCHAIN_ROOT) diff --git a/target/product/emulator.mk b/target/product/emulator.mk index 6812c221f5..d0a0b7a7a4 100644 --- a/target/product/emulator.mk +++ b/target/product/emulator.mk @@ -18,6 +18,13 @@ # emulator-related modules to PRODUCT_PACKAGES. # +# RM(2014-05-05) temporarily disable emulator build +# (ongoing breakage with emulator-64 on darwin, being worked +# upon but we need the rest of the build to work in between.) +ifneq ($(HOST_OS),darwin) +$(warning ######### emulator-64 temporarily deactivated for $(HOST_OS) ########) + + # Host modules PRODUCT_PACKAGES += \ emulator \ @@ -62,3 +69,5 @@ PRODUCT_COPY_FILES += \ device/generic/goldfish/init.goldfish.rc:root/init.goldfish.rc \ device/generic/goldfish/init.goldfish.sh:system/etc/init.goldfish.sh \ device/generic/goldfish/ueventd.goldfish.rc:root/ueventd.goldfish.rc + +endif |