Pass in current android.jar to api-generator

This ensures that the api-versions.xml shipped with
the SDK always includes the correct latest API
data (see http://b.android.com/183500)

Change-Id: I96a6b0218abeaf3865a49de0fdd2be933f88c469
(cherry picked from commit fbe6c8105a6cbd880ff50d9799e23cf1790f1301)
diff --git a/build/Android.mk b/build/Android.mk
index 72ec31d..b6445a0 100644
--- a/build/Android.mk
+++ b/build/Android.mk
@@ -126,7 +126,7 @@
 
 ALL_SDK_FILES += $(HOST_OUT)/development/sdk/generated-api-versions.xml
 
-api_gen_jar := $(TOPDIR)prebuilts/tools/common/api-generator/api-generator-22.9.2.jar
+api_gen_jar := $(TOPDIR)prebuilts/tools/common/api-generator/api-generator-22.9.3.jar
 api_gen_deps := \
   $(TOPDIR)prebuilts/tools/common/kxml2-tools/kxml2-2.3.0.jar \
   $(TOPDIR)prebuilts/tools/common/asm-tools/asm-4.0.jar \
@@ -135,11 +135,14 @@
 api_gen_classpath := $(subst $(space),:,$(api_gen_jar) $(api_gen_deps))
 
 
-$(HOST_OUT)/development/sdk/generated-api-versions.xml :
+$(HOST_OUT)/development/sdk/generated-api-versions.xml: $(android_jar_full_target)
 	java -cp $(api_gen_classpath) \
 	  com.android.apigenerator.Main \
 	  --pattern $(TOPDIR)prebuilts/tools/common/api-versions/android-%/android.jar \
 	  --pattern $(TOPDIR)prebuilts/sdk/%/android.jar \
+	  --current-version $(PLATFORM_SDK_VERSION) \
+	  --current-codename $(PLATFORM_VERSION_CODENAME) \
+	  --current-jar $(android_jar_full_target) \
 	  $@