diff options
| author | Ying Wang <wangying@google.com> | 2010-07-13 17:24:09 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-07-13 17:24:09 -0700 |
| commit | 90cf34c72e204eb1d23f43d1fccbf2076e8ff67b (patch) | |
| tree | ec70f242d3c8207ac5abb5d76c33ab53315322fb /core/config.mk | |
| parent | 1778b4b11effa15b3b540a5153f68127a9ec6adb (diff) | |
| parent | f0f60cdd8f4f74b2480774887606afdebec8d891 (diff) | |
| download | build-90cf34c72e204eb1d23f43d1fccbf2076e8ff67b.zip build-90cf34c72e204eb1d23f43d1fccbf2076e8ff67b.tar.gz build-90cf34c72e204eb1d23f43d1fccbf2076e8ff67b.tar.bz2 | |
am f0f60cdd: resolved conflicts for merge of 1a08100f to gingerbread
Merge commit 'f0f60cdd8f4f74b2480774887606afdebec8d891' into gingerbread-plus-aosp
* commit 'f0f60cdd8f4f74b2480774887606afdebec8d891':
Support to build native libraries with prebuilt NDK
Diffstat (limited to 'core/config.mk')
| -rw-r--r-- | core/config.mk | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/core/config.mk b/core/config.mk index 8fd7677..1194f4b 100644 --- a/core/config.mk +++ b/core/config.mk @@ -317,6 +317,7 @@ PREBUILT_IS_PRESENT := $(if $(wildcard prebuilt/Android.mk),true) # ############################################################### HISTORICAL_SDK_VERSIONS_ROOT := $(TOPDIR)prebuilt/sdk +HISTORICAL_NDK_VERSIONS_ROOT := $(TOPDIR)prebuilt/ndk # Historical SDK version N is stored in $(HISTORICAL_SDK_VERSIONS_ROOT)/N. # The 'current' version is whatever this source tree is. @@ -338,4 +339,8 @@ TARGET_AVAILABLE_SDK_VERSIONS := current $(call numerically_sort,\ $(patsubst $(HISTORICAL_SDK_VERSIONS_ROOT)/%/android.jar,%, \ $(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*))) + INTERNAL_PLATFORM_API_FILE := $(TARGET_OUT_COMMON_INTERMEDIATES)/PACKAGING/public_api.xml |