am bbd9b96c: am 8235126e: am 9649c415: Merge "Change api-versions.xml generator source order."

* commit 'bbd9b96cd10864554c5f3f9ab5e0e1bbf43442b6':
  Change api-versions.xml generator source order.
This commit is contained in:
Raphael Moll
2014-06-11 20:24:31 +00:00
committed by Android Git Automerger

View File

@@ -169,8 +169,8 @@ api_gen_classpath := $(subst $(space),:,$(api_gen_jar) $(api_gen_deps))
$(HOST_OUT)/development/sdk/generated-api-versions.xml :
java -cp $(api_gen_classpath) \
com.android.apigenerator.Main \
--pattern $(TOPDIR)prebuilts/sdk/%/android.jar \
--pattern $(TOPDIR)prebuilts/tools/common/api-versions/android-%/android.jar \
--pattern $(TOPDIR)prebuilts/sdk/%/android.jar \
$@