Merge "Fix recovery_unit_test"

$(my_package_zip): PRIVATE_COPY_PAIRS := $(my_copy_pairs)

$(my_package_zip): PRIVATE_STAGING_DIR := $(my_staging_dir)

$(my_package_zip): PRIVATE_PICKUP_FILES := $(my_pickup_files)

$(my_package_zip) : $(my_built_modules) $(SOONG_ZIP)

$(my_package_zip) : $(my_built_modules)

	@echo "Package $@"

	@rm -rf $(PRIVATE_STAGING_DIR) && mkdir -p $(PRIVATE_STAGING_DIR)

	$(foreach p, $(PRIVATE_COPY_PAIRS),\

	  cp -Rf $(word 1,$(pair)) $(word 2,$(pair)) && ) true

	$(hide) $(foreach f, $(PRIVATE_PICKUP_FILES),\

	  cp -RfL $(f) $(PRIVATE_STAGING_DIR) && ) true

	$(hide) $(SOONG_ZIP) -o $@ -C $(PRIVATE_STAGING_DIR) -D $(PRIVATE_STAGING_DIR)

	$(hide) cd $(PRIVATE_STAGING_DIR) && zip -rqX ../$(notdir $@) *

my_makefile :=

my_staging_dir :=