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/config.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/config.mk')
| -rw-r--r-- | core/config.mk | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/core/config.mk b/core/config.mk index 194fbe1..8be9457 100644 --- a/core/config.mk +++ b/core/config.mk @@ -323,13 +323,6 @@ else COLUMN:= column endif -dir := $(shell uname) -ifeq ($(HOST_OS),windows) -dir := $(HOST_OS) -endif -ifeq ($(HOST_OS),darwin) -dir := $(HOST_OS)-$(HOST_ARCH) -endif OLD_FLEX := prebuilts/misc/$(HOST_PREBUILT_TAG)/flex/flex-2.5.4a$(HOST_EXECUTABLE_SUFFIX) ifeq ($(HOST_OS),darwin) @@ -441,8 +434,8 @@ TARGET_AVAILABLE_SDK_VERSIONS := $(call numerically_sort,\ $(wildcard $(HISTORICAL_SDK_VERSIONS_ROOT)/*/android.jar))) TARGET_AVAILABLE_NDK_VERSIONS := $(call numerically_sort,\ - $(patsubst $(HISTORICAL_NDK_VERSIONS_ROOT)/android-ndk-r%,%, \ - $(wildcard $(HISTORICAL_NDK_VERSIONS_ROOT)/android-ndk-r*))) + $(patsubst $(HISTORICAL_NDK_VERSIONS_ROOT)/%/platforms,%, \ + $(wildcard $(HISTORICAL_NDK_VERSIONS_ROOT)/*/platforms))) INTERNAL_PLATFORM_API_FILE := $(TARGET_OUT_COMMON_INTERMEDIATES)/PACKAGING/public_api.txt |