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

Commit 9cddb35a authored by Jihoon Kang's avatar Jihoon Kang
Browse files

Convert api.xml dist rules to Soong 

...from make to support dist'ing *-api.xml files in soong-only builds.

Test: m droid dist --soong-only && ls out/dist/api.xml
Bug: 395162087
Bug: 394365683
Change-Id: I9970ff291aef635b5f8a06b3e129110a0df1cf53
parent a8375887

core/main.mk

+0 −18
Original line number Original line Diff line number Diff line
@@ -1667,24 +1667,6 @@ else ifeq ($(TARGET_BUILD_UNBUNDLED),$(TARGET_BUILD_UNBUNDLED_IMAGE)) 
    $(call dist-for-goals, dist_files, $(JACOCO_REPORT_CLASSES_ALL))

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

  endif

  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

  ifdef CLANG_COVERAGE

    $(foreach f,$(SOONG_NDK_API_XML), \

    $(foreach f,$(SOONG_NDK_API_XML), \

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

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