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

Commit 22e726bc authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Delete APPS_ZIP" into main am: 9ea8ad92 am: fe8f1ba4 

Original change: https://android-review.googlesource.com/c/platform/build/+/3491230



Change-Id: I68109aa74d9dac8baf7881fffea26a90ee342a6b
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 056b35fc fe8f1ba4

core/Makefile

+0 −23
Original line number Diff line number Diff line
@@ -7318,29 +7318,6 @@ ifeq (true,$(CLANG_COVERAGE)) 
  $(call dist-for-goals,droidcore-unbundled apps_only,$(LLVM_COVERAGE_TOOLS_ZIP))

endif



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

# A zip of the Android Apps. Not keeping full path so that we don't

# include product names when distributing

#

name := $(TARGET_PRODUCT)

ifeq ($(TARGET_BUILD_TYPE),debug)

  name := $(name)_debug

endif

name := $(name)-apps



APPS_ZIP := $(PRODUCT_OUT)/$(name).zip

$(APPS_ZIP): $(FULL_SYSTEMIMAGE_DEPS)

	@echo "Package apps: $@"

	$(hide) rm -rf $@

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

	$(hide) apps_to_zip=`find $(TARGET_OUT_APPS) $(TARGET_OUT_APPS_PRIVILEGED) -mindepth 2 -maxdepth 3 -name "*.apk"`; \

	if [ -z "$$apps_to_zip" ]; then \

	    echo "No apps to zip up. Generating empty apps archive." ; \

	    a=$$(mktemp /tmp/XXXXXXX) && touch $$a && zip $@ $$a && zip -d $@ $$a; \

	else \

	    zip -qjX $@ $$apps_to_zip; \

	fi



ifeq (true,$(EMMA_INSTRUMENT))

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

# An archive of classes for use in generating code-coverage reports

core/main.mk

+0 −1
Original line number Diff line number Diff line
@@ -1621,7 +1621,6 @@ else ifeq ($(TARGET_BUILD_UNBUNDLED),$(TARGET_BUILD_UNBUNDLED_IMAGE)) 


  ifneq ($(ANDROID_BUILD_EMBEDDED),true)

    $(call dist-for-goals-with-filenametag, droidcore, \

      $(APPS_ZIP) \

      $(INTERNAL_EMULATOR_PACKAGE_TARGET) \

    )

  endif