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

Merge commit 'bbbed9e1f1be3cd8327ba89f47e9bd628d92cbe2'

* commit 'bbbed9e1f1be3cd8327ba89f47e9bd628d92cbe2':
  Prebuilt NDKs are merged for linux and darwin.
This commit is contained in:
Ying Wang 2010-09-23 21:41:18 -07:00 committed by Android Git Automerger
commit 7b3bb9461a

View file

@ -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