commit 07603d63f60a885c591d0557e4d05beadd0a740c
author Treehugger Robot <treehugger-gerrit@google.com> Thu Feb 14 05:19:34 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Feb 14 05:19:34 2019 +0000
tree d9363c615f3876cae96533a2f2ee76b4b270d97a
parent f83ba4e8b1071d29931712ca746c3b74f4ee589f
parent 191f0e5b60f63bbf9f1517da489e72138543098d

Merge "Generate API XML files from android stub targets instead of text input."

core/main.mk

diff --git a/core/main.mk b/core/main.mk
index 14d2fe5..610ab28 100644
--- a/core/main.mk
+++ b/core/main.mk
@@ -1510,11 +1510,15 @@
     $(call dist-for-goals, dist_files, $(JACOCO_REPORT_CLASSES_ALL))
 
     # Put XML formatted API files in the dist dir.
+    $(TARGET_OUT_COMMON_INTERMEDIATES)/api.xml: $(call java-lib-header-files,android_stubs_current) $(APICHECK)
+    $(TARGET_OUT_COMMON_INTERMEDIATES)/system-api.xml: $(call java-lib-header-files,android_system_stubs_current) $(APICHECK)
+    $(TARGET_OUT_COMMON_INTERMEDIATES)/test-api.xml: $(call java-lib-header-files,android_test_stubs_current) $(APICHECK)
+
     api_xmls := $(addprefix $(TARGET_OUT_COMMON_INTERMEDIATES)/,api.xml system-api.xml test-api.xml)
-    $(api_xmls): $(TARGET_OUT_COMMON_INTERMEDIATES)/%api.xml : frameworks/base/api/%current.txt $(APICHECK)
+    $(api_xmls):
 	$(hide) echo "Converting API file to XML: $@"
 	$(hide) mkdir -p $(dir $@)
-	$(hide) $(APICHECK_COMMAND) -convert2xml $< $@
+	$(hide) $(APICHECK_COMMAND) --input-api-jar $< --api-xml $@
 
     $(call dist-for-goals, dist_files, $(api_xmls))
     api_xmls :=