Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e3dee679 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Convert api.xml dist rules to Soong" into main

parents 0199ee57 9cddb35a

core/main.mk

+0 −18
Original line number Diff line number Diff line
@@ -1668,24 +1668,6 @@ else ifeq ($(TARGET_BUILD_UNBUNDLED),$(TARGET_BUILD_UNBUNDLED_IMAGE)) 
    $(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-files,$(ANDROID_PUBLIC_STUBS)) $(APICHECK)

  $(TARGET_OUT_COMMON_INTERMEDIATES)/system-api.xml: $(call java-lib-files,$(ANDROID_SYSTEM_STUBS)) $(APICHECK)

  $(TARGET_OUT_COMMON_INTERMEDIATES)/module-lib-api.xml: $(call java-lib-files,$(ANDROID_MODULE_LIB_STUBS)) $(APICHECK)

  $(TARGET_OUT_COMMON_INTERMEDIATES)/system-server-api.xml: $(call java-lib-files,$(ANDROID_SYSTEM_SERVER_STUBS)) $(APICHECK)

  $(TARGET_OUT_COMMON_INTERMEDIATES)/test-api.xml: $(call java-lib-files,$(ANDROID_TEST_STUBS)) $(APICHECK)



  api_xmls := $(addprefix $(TARGET_OUT_COMMON_INTERMEDIATES)/,api.xml system-api.xml module-lib-api.xml system-server-api.xml test-api.xml)

  $(api_xmls):

	$(hide) echo "Converting API file to XML: $@"

	$(hide) mkdir -p $(dir $@)

	$(hide) $(APICHECK_COMMAND) jar-to-jdiff $< $@



  $(foreach xml,$(sort $(api_xmls)),$(call declare-1p-target,$(xml),))



  $(call dist-for-goals, dist_files, $(api_xmls))

  api_xmls :=



  ifdef CLANG_COVERAGE

    $(foreach f,$(SOONG_NDK_API_XML), \

        $(call dist-for-goals,droidcore,$(f):ndk_apis/$(notdir $(f))))