commit bbbed9e1f1be3cd8327ba89f47e9bd628d92cbe2
author Ying Wang <wangying@google.com> Thu Sep 23 18:05:38 2010 -0700
committer Android Git Automerger <android-git-automerger@android.com> Thu Sep 23 18:05:38 2010 -0700
tree ce0b5989c13a64c0a3f6bc41d5c918e2e636f999
parent 4f9c4f4dbbd6ddedc7f8c61c35ea80953aa9d113
parent 02c9813a726803e1c406b19f6b9dc4e411326e66

am 02c9813a: Prebuilt NDKs are merged for linux and darwin.

Merge commit '02c9813a726803e1c406b19f6b9dc4e411326e66' into gingerbread-plus-aosp

* commit '02c9813a726803e1c406b19f6b9dc4e411326e66':
  Prebuilt NDKs are merged for linux and darwin.

core/binary.mk

diff --git a/core/binary.mk b/core/binary.mk
index e8f1d80..3358544 100644
--- a/core/binary.mk
+++ b/core/binary.mk
@@ -28,7 +28,7 @@
   ifndef LOCAL_SDK_VERSION
     $(error $(LOCAL_PATH): LOCAL_NDK_VERSION must be defined with LOCAL_SDK_VERSION)
   endif
-  my_ndk_version_root := $(HISTORICAL_NDK_VERSIONS_ROOT)/android-ndk-r$(LOCAL_NDK_VERSION)/$(BUILD_OS)/platforms/android-$(LOCAL_SDK_VERSION)/arch-$(TARGET_ARCH)
+  my_ndk_version_root := $(HISTORICAL_NDK_VERSIONS_ROOT)/android-ndk-r$(LOCAL_NDK_VERSION)/platforms/android-$(LOCAL_SDK_VERSION)/arch-$(TARGET_ARCH)
   ifeq ($(wildcard $(my_ndk_version_root)),)
     $(error $(LOCAL_PATH): ndk version root does not exist: $(my_ndk_version_root))
   endif