commit ac3bf4e3a9923d60c799ad6b160ffb966e6412a2
author Treehugger Robot <treehugger-gerrit@google.com> Tue Dec 10 04:49:28 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Dec 10 04:49:28 2019 +0000
tree d3c6743c0fcb81e6f968469a0162a5b2738011a5
parent 1b9fd38513ad7fb03dd6ce71b6ba28b373353701
parent 743c9c3b6b27e583467e3efe803c8864d1aaef21

Merge "Move to using full java-lib-files from stubs."

core/main.mk

diff --git a/core/main.mk b/core/main.mk
index fd02a83..5767ef4 100644
--- a/core/main.mk
+++ b/core/main.mk
@@ -1745,9 +1745,9 @@
   endif
 
   # 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)
+  $(TARGET_OUT_COMMON_INTERMEDIATES)/api.xml: $(call java-lib-files,android_stubs_current) $(APICHECK)
+  $(TARGET_OUT_COMMON_INTERMEDIATES)/system-api.xml: $(call java-lib-files,android_system_stubs_current) $(APICHECK)
+  $(TARGET_OUT_COMMON_INTERMEDIATES)/test-api.xml: $(call java-lib-files,android_test_stubs_current) $(APICHECK)
 
   api_xmls := $(addprefix $(TARGET_OUT_COMMON_INTERMEDIATES)/,api.xml system-api.xml test-api.xml)
   $(api_xmls):