commit 75b28573fe739a10f0f91fab1ef916ddd1c0b91c
author Ying Wang <wangying@google.com> Fri Jul 16 11:34:36 2010 -0700
committer Ying Wang <wangying@google.com> Fri Jul 16 11:34:36 2010 -0700
tree 0985a08912745ad0cd684d70d1b5c80611d295da
parent 9269a711753f2523acd3fe5ae661559f754a1bd0

Fix sim build for unbundling native code

NDK does not support sim build.

Change-Id: I57a09c0083126c57a99cf33c055edef3390d1c28

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)