commit f0dd8584fd729c656f2aea5b5f5386d62eecc6f7
author Ying Wang <wangying@google.com> Fri Aug 10 10:57:37 2012 -0700
committer Ying Wang <wangying@google.com> Fri Aug 10 10:57:37 2012 -0700
tree 00f4c2162bdb5302753f274361e3cb5348a3270d
parent 31bd5a89ce0e764e7df361ac2306312bbfa22155

Adopt the new prebuilts/ndk/<number> paths.

Bug: 6932421
Change-Id: Iba7200aacef2201001f92c6ffa020881f0b528ea

core/binary.mk

diff --git a/core/binary.mk b/core/binary.mk
index 23bbc81..3f01489 100644
--- a/core/binary.mk
+++ b/core/binary.mk
@@ -24,8 +24,8 @@
   ifndef LOCAL_SDK_VERSION
     $(error $(LOCAL_PATH): LOCAL_NDK_VERSION must be defined with LOCAL_SDK_VERSION)
   endif
-  my_ndk_source_root := $(HISTORICAL_NDK_VERSIONS_ROOT)/android-ndk-r$(LOCAL_NDK_VERSION)/sources
-  my_ndk_version_root := $(HISTORICAL_NDK_VERSIONS_ROOT)/android-ndk-r$(LOCAL_NDK_VERSION)/platforms/android-$(LOCAL_SDK_VERSION)/arch-$(TARGET_ARCH)
+  my_ndk_source_root := $(HISTORICAL_NDK_VERSIONS_ROOT)/$(LOCAL_NDK_VERSION)/sources
+  my_ndk_version_root := $(HISTORICAL_NDK_VERSIONS_ROOT)/$(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