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

* commit '8235126ebf42ddd9dd1e9d8191be67ae46cb54ae':
  Change api-versions.xml generator source order.
This commit is contained in:
Raphael Moll
2014-06-10 21:12:13 +00:00
committed by Android Git Automerger

View File

@@ -166,8 +166,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 \
$@