diff options
| author | Joe Onorato <joeo@google.com> | 2012-07-25 17:41:33 -0700 |
|---|---|---|
| committer | android code review <noreply-gerritcodereview@google.com> | 2012-07-25 17:41:34 -0700 |
| commit | c736fb6e80a357bdde308f857bcbbc48f4c41eba (patch) | |
| tree | ed7c29ab7a914930331dac10a090153356eb83e6 | |
| parent | 9096e372a1bfc2c5b812346047dc25648c7dafb8 (diff) | |
| parent | edb86c32883f3407e54575599ec7dc319c32095e (diff) | |
| download | external_qemu-c736fb6e80a357bdde308f857bcbbc48f4c41eba.zip external_qemu-c736fb6e80a357bdde308f857bcbbc48f4c41eba.tar.gz external_qemu-c736fb6e80a357bdde308f857bcbbc48f4c41eba.tar.bz2 | |
Merge "Don't try to build the emulator on Mac OS if the right tools aren't installed."
| -rw-r--r-- | Makefile.android | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/Makefile.android b/Makefile.android index 817c562..905622e 100644 --- a/Makefile.android +++ b/Makefile.android @@ -1,3 +1,5 @@ +ifeq ($(BUILD_EMULATOR),true) + ifneq (,$(filter $(TARGET_ARCH),arm x86 mips)) LOCAL_PATH:= $(call my-dir) @@ -328,3 +330,4 @@ $(call end-emulator-program) ## VOILA!! endif # TARGET_ARCH == arm || TARGET_ARCH == x86 || TARGET_ARCH == mips +endif # BUILD_EMULATOR |