diff options
| author | Ying Wang <wangying@google.com> | 2010-07-13 17:21:33 -0700 |
|---|---|---|
| committer | Ying Wang <wangying@google.com> | 2010-07-13 17:21:33 -0700 |
| commit | f0f60cdd8f4f74b2480774887606afdebec8d891 (patch) | |
| tree | 0abeae18b25ab87509ce6ac683fbcd83b6b09d25 /core/config.mk | |
| parent | 0d205521ae4e8907bcc80774260a68c923970eca (diff) | |
| parent | 1a08100fa9d92c25de32ba4d13fd3958bbcab894 (diff) | |
| download | build-f0f60cdd8f4f74b2480774887606afdebec8d891.zip build-f0f60cdd8f4f74b2480774887606afdebec8d891.tar.gz build-f0f60cdd8f4f74b2480774887606afdebec8d891.tar.bz2 | |
resolved conflicts for merge of 1a08100f to gingerbread
Change-Id: I9e4183a1d5c0efb13de8655b9eb7c74d50b34cd7
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 8d2f96c..81842be 100644 --- a/core/config.mk +++ b/core/config.mk @@ -316,6 +316,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. @@ -337,4 +338,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 |