From 361e4439d000ff746962079721d58b7683fe00d4 Mon Sep 17 00:00:00 2001 From: Jared Lim Date: Wed, 13 Mar 2019 16:12:20 -0700 Subject: [PATCH] Generate api.xml for every target build. Test: make dist DIST_DIR=out/dist Change-Id: I8cf7290c8a3757110761e9c852339b841c5d1748 --- core/main.mk | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/core/main.mk b/core/main.mk index 5d97027d4e..77b8385803 100644 --- a/core/main.mk +++ b/core/main.mk @@ -1573,21 +1573,21 @@ else # TARGET_BUILD_APPS ifeq ($(EMMA_INSTRUMENT),true) $(JACOCO_REPORT_CLASSES_ALL) : $(INSTALLED_SYSTEMIMAGE_TARGET) $(call dist-for-goals, dist_files, $(JACOCO_REPORT_CLASSES_ALL)) + 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) + # 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): + api_xmls := $(addprefix $(TARGET_OUT_COMMON_INTERMEDIATES)/,api.xml system-api.xml test-api.xml) + $(api_xmls): $(hide) echo "Converting API file to XML: $@" $(hide) mkdir -p $(dir $@) $(hide) $(APICHECK_COMMAND) --input-api-jar $< --api-xml $@ - $(call dist-for-goals, dist_files, $(api_xmls)) - api_xmls := - endif + $(call dist-for-goals, dist_files, $(api_xmls)) + api_xmls := # Building a full system-- the default is to build droidcore droid_targets: droidcore dist_files