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

Commit bf01d830 authored by Dario Freni's avatar Dario Freni Committed by android-build-merger
Browse files

Merge "Generate a zipfile with appcompat logs during dist." 

am: 4abd9488

Change-Id: Ibdabbe448ef64634eb36de3f24d720efafaa440f
parents 68ab6aeb 4abd9488

core/Makefile

+22 −0
Original line number Original line Diff line number Diff line
@@ -3256,6 +3256,27 @@ $(INTERNAL_UPDATE_PACKAGE_TARGET): $(BUILT_TARGET_FILES_PACKAGE) $(ZIP2ZIP) 
.PHONY: updatepackage

.PHONY: updatepackage

updatepackage: $(INTERNAL_UPDATE_PACKAGE_TARGET)

updatepackage: $(INTERNAL_UPDATE_PACKAGE_TARGET)





# -----------------------------------------------------------------

# A zip of the appcompat directory containing logs

APPCOMPAT_ZIP := $(PRODUCT_OUT)/appcompat.zip

# For apps_only build we'll establish the dependency later in build/make/core/main.mk.

ifndef TARGET_BUILD_APPS

$(APPCOMPAT_ZIP): $(INSTALLED_SYSTEMIMAGE) \

		$(INSTALLED_BOOTIMAGE_TARGET) \

		$(INSTALLED_USERDATAIMAGE_TARGET) \

		$(INSTALLED_VENDORIMAGE_TARGET) \

		$(INSTALLED_PRODUCTIMAGE_TARGET) \

		$(INSTALLED_PRODUCT_SERVICESIMAGE_TARGET)

endif

$(APPCOMPAT_ZIP): PRIVATE_LIST_FILE := $(call intermediates-dir-for,PACKAGING,appcompat)/filelist

$(APPCOMPAT_ZIP): $(SOONG_ZIP)

	@echo "appcompat logs: $@"

	$(hide) rm -rf $@ $(PRIVATE_LIST_FILE)

	$(hide) mkdir -p $(dir $@) $(PRODUCT_OUT)/appcompat $(dir $(PRIVATE_LIST_FILE))

	$(hide) find $(PRODUCT_OUT)/appcompat | sort >$(PRIVATE_LIST_FILE)

	$(hide) $(SOONG_ZIP) -d -o $@ -C $(PRODUCT_OUT)/appcompat -l $(PRIVATE_LIST_FILE)





# -----------------------------------------------------------------

# -----------------------------------------------------------------

# A zip of the symbols directory.  Keep the full paths to make it

# A zip of the symbols directory.  Keep the full paths to make it

# more obvious where these files came from.

# more obvious where these files came from.
@@ -3512,6 +3533,7 @@ deps := \ 
	$(OUT_DOCS)/offline-sdk-timestamp \

	$(OUT_DOCS)/offline-sdk-timestamp \

	$(SYMBOLS_ZIP) \

	$(SYMBOLS_ZIP) \

	$(COVERAGE_ZIP) \

	$(COVERAGE_ZIP) \

	$(APPCOMPAT_ZIP) \

	$(INSTALLED_SYSTEMIMAGE) \

	$(INSTALLED_SYSTEMIMAGE) \

	$(INSTALLED_QEMU_SYSTEMIMAGE) \

	$(INSTALLED_QEMU_SYSTEMIMAGE) \

	$(INSTALLED_QEMU_VENDORIMAGE) \

	$(INSTALLED_QEMU_VENDORIMAGE) \

core/main.mk

+5 −0
Original line number Original line Diff line number Diff line
@@ -1262,6 +1262,9 @@ ifneq ($(TARGET_BUILD_APPS),) 
  $(COVERAGE_ZIP) : $(apps_only_installed_files)

  $(COVERAGE_ZIP) : $(apps_only_installed_files)

  $(call dist-for-goals,apps_only, $(COVERAGE_ZIP))

  $(call dist-for-goals,apps_only, $(COVERAGE_ZIP))





  $(APPCOMPAT_ZIP) : $(apps_only_installed_files)

  $(call dist-for-goals,apps_only, $(APPCOMPAT_ZIP))



.PHONY: apps_only

.PHONY: apps_only

apps_only: $(unbundled_build_modules)

apps_only: $(unbundled_build_modules)
@@ -1283,6 +1286,7 @@ else # TARGET_BUILD_APPS 
    $(BUILT_OTATOOLS_PACKAGE) \

    $(BUILT_OTATOOLS_PACKAGE) \

    $(SYMBOLS_ZIP) \

    $(SYMBOLS_ZIP) \

    $(COVERAGE_ZIP) \

    $(COVERAGE_ZIP) \

    $(APPCOMPAT_ZIP) \

    $(INSTALLED_FILES_FILE) \

    $(INSTALLED_FILES_FILE) \

    $(INSTALLED_FILES_JSON) \

    $(INSTALLED_FILES_JSON) \

    $(INSTALLED_FILES_FILE_VENDOR) \

    $(INSTALLED_FILES_FILE_VENDOR) \
@@ -1350,6 +1354,7 @@ $(call dist-for-goals,sdk win_sdk, \ 
    $(ALL_SDK_TARGETS) \

    $(ALL_SDK_TARGETS) \

    $(SYMBOLS_ZIP) \

    $(SYMBOLS_ZIP) \

    $(COVERAGE_ZIP) \

    $(COVERAGE_ZIP) \

    $(APPCOMPAT_ZIP) \

    $(INSTALLED_BUILD_PROP_TARGET) \

    $(INSTALLED_BUILD_PROP_TARGET) \

)

)