commit 0ea63e0cbd974863f9c828951d3a9228de962db6
author Ying Wang <wangying@google.com> Mon Jul 21 22:24:31 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Sat Jul 19 22:40:06 2014 +0000
tree 2c521ba3ef7c1db050893c564c18c5492a0e28e7
parent 2f7b92c90a5e58619fc88d5c7f4d8c36276a7b18
parent 14c975b830aa764272bb76aa207b5dbf15fe422e

Merge "Remove framework2" into lmp-dev

core/config.mk

diff --git a/core/config.mk b/core/config.mk
index ad12fef..716f88f 100644
--- a/core/config.mk
+++ b/core/config.mk
@@ -585,8 +585,10 @@
 
 TARGET_AVAILABLE_SDK_VERSIONS := $(call numerically_sort,\
     $(patsubst $(HISTORICAL_SDK_VERSIONS_ROOT)/%/android.jar,%, \
-    $(wildcard $(HISTORICAL_SDK_VERSIONS_ROOT)/*/android.jar))) \
-    system_current
+    $(wildcard $(HISTORICAL_SDK_VERSIONS_ROOT)/*/android.jar)))
+
+# We don't have prebuilt system_current SDK yet.
+TARGET_AVAILABLE_SDK_VERSIONS := system_current $(TARGET_AVAILABLE_SDK_VERSIONS)
 
 INTERNAL_PLATFORM_API_FILE := $(TARGET_OUT_COMMON_INTERMEDIATES)/PACKAGING/public_api.txt
 INTERNAL_PLATFORM_REMOVED_API_FILE := $(TARGET_OUT_COMMON_INTERMEDIATES)/PACKAGING/removed.txt