commit d5c217aca18726f0ed9f2ea034f750620d4bdf7d
author Ying Wang <wangying@google.com> Thu Jul 22 10:51:03 2010 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Thu Jul 22 10:51:03 2010 -0700
tree 8b9966e75bdff6fb5d43008bfd95606570726422
parent 75b28573fe739a10f0f91fab1ef916ddd1c0b91c
parent 0188414bc634798fa429be627cdb697daee68966

Merge "add phony target "all_modules" and use it as make goal for "mm"/"mmm"" into froyo

core/binary.mk

diff --git a/core/binary.mk b/core/binary.mk
index da9eca1..7923fbe 100644
--- a/core/binary.mk
+++ b/core/binary.mk
@@ -9,6 +9,10 @@
 ## Sanity check for LOCAL_NDK_VERSION
 ######################################
 my_ndk_version_root :=
+ifeq ($(TARGET_SIMULATOR),true)
+  # NDK does not support sim build.
+  LOCAL_NDK_VERSION :=
+endif
 ifdef LOCAL_NDK_VERSION
   ifdef LOCAL_IS_HOST_MODULE
     $(error $(LOCAL_PATH): LOCAL_NDK_VERSION can not be used in host module)