diff options
| author | Ying Wang <wangying@google.com> | 2012-08-14 11:57:01 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-08-14 11:57:01 -0700 |
| commit | d4f0ffcb6b30c96160667d1757edb9d3692caba8 (patch) | |
| tree | dbc31b69e594665f414452f64465f13db98b0184 /core/binary.mk | |
| parent | 1196c82491e29eed257a44aa7384d8b836657b82 (diff) | |
| parent | 7f8d0ba6bd4b23295bbddda47e85a69b15922dd1 (diff) | |
| download | build-d4f0ffcb6b30c96160667d1757edb9d3692caba8.zip build-d4f0ffcb6b30c96160667d1757edb9d3692caba8.tar.gz build-d4f0ffcb6b30c96160667d1757edb9d3692caba8.tar.bz2 | |
Merge "Adopt the new prebuilts/ndk/<number> paths." into jb-mr1-dev
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 |