summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYing Wang <wangying@google.com>2010-09-23 17:59:36 -0700
committerYing Wang <wangying@google.com>2010-09-23 17:59:36 -0700
commit02c9813a726803e1c406b19f6b9dc4e411326e66 (patch)
treec9b933edc0c6db282c24dae59586db7eac125f01
parent50d7d7a0a68378d1b02b5d2a2514592ba0d65f84 (diff)
downloadbuild-02c9813a726803e1c406b19f6b9dc4e411326e66.zip
build-02c9813a726803e1c406b19f6b9dc4e411326e66.tar.gz
build-02c9813a726803e1c406b19f6b9dc4e411326e66.tar.bz2
Prebuilt NDKs are merged for linux and darwin.
Change-Id: I0b632d7ba4df5b27dda36280b22dfd0b37e116b7
-rw-r--r--core/binary.mk2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/binary.mk b/core/binary.mk
index 1f55b66..5fb0e75 100644
--- a/core/binary.mk
+++ b/core/binary.mk
@@ -28,7 +28,7 @@ ifdef LOCAL_NDK_VERSION
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