diff options
| author | Ying Wang <wangying@google.com> | 2012-08-10 10:57:37 -0700 |
|---|---|---|
| committer | Ying Wang <wangying@google.com> | 2012-08-14 11:55:46 -0700 |
| commit | 7f8d0ba6bd4b23295bbddda47e85a69b15922dd1 (patch) | |
| tree | a9d6781c8377cb700cc76eefbf1d4d98c24bfe40 /core/binary.mk | |
| parent | f59a64b7cba7330701b8791698e67abff8afde65 (diff) | |
| download | build-7f8d0ba6bd4b23295bbddda47e85a69b15922dd1.zip build-7f8d0ba6bd4b23295bbddda47e85a69b15922dd1.tar.gz build-7f8d0ba6bd4b23295bbddda47e85a69b15922dd1.tar.bz2 | |
Adopt the new prebuilts/ndk/<number> paths.
Bug: 6932421
Change-Id: Iba7200aacef2201001f92c6ffa020881f0b528ea
Diffstat (limited to 'core/binary.mk')
| -rw-r--r-- | core/binary.mk | 4 |
1 files changed, 2 insertions, 2 deletions
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 @@ ifdef LOCAL_NDK_VERSION 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 |