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

Commit 616764b2 authored by Dan Willemsen's avatar Dan Willemsen Committed by android-build-merger
Browse files

Merge "Support custom my_copy_pairs in package-modules.mk" 

am: 5b91bd4c

Change-Id: I87afb199ec7504ca0c927332a641f93587a8480e
parents 5a7d87af 5b91bd4c

core/tasks/tools/build_custom_image.mk

+6 −0
Original line number Diff line number Diff line
@@ -144,3 +144,9 @@ custom_images $(my_custom_image_name) : $(my_installed_custom_image) 


# Archive the built image.

$(call dist-for-goals, $(my_custom_image_name) custom_images,$(my_installed_custom_image))



my_staging_dir :=

my_built_modules :=

my_copy_dest :=

my_copy_pairs :=

my_pickup_files :=

core/tasks/tools/package-modules.mk

+12 −2
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ 
# Input variables:

#   my_modules: a list of module names

#   my_package_name: the name of the output zip file.

#   my_copy_pairs: a list of extra files to install (in src:dest format)

# Output variables:

#   my_package_zip: the path to the output zip file.

#
@@ -11,8 +12,8 @@ 


my_makefile := $(lastword $(filter-out $(lastword $(MAKEFILE_LIST)),$(MAKEFILE_LIST)))

my_staging_dir := $(call intermediates-dir-for,PACKAGING,$(my_package_name))

my_built_modules :=

my_copy_pairs :=

my_built_modules := $(foreach p,$(my_copy_pairs),$(call word-colon,1,$(p)))

my_copy_pairs := $(foreach p,$(my_copy_pairs),$(call word-colon,1,$(p)):$(my_staging_dir)/$(call word-colon,2,$(p)))

my_pickup_files :=



# Iterate over the modules and include their direct dependencies stated in the
@@ -67,3 +68,12 @@ $(my_package_zip) : $(my_built_modules) 
	$(hide) $(foreach f, $(PRIVATE_PICKUP_FILES),\

	  cp -RfL $(f) $(dir $@) && ) true

	$(hide) cd $(dir $@) && zip -rqX $(notdir $@) *



my_makefile :=

my_staging_dir :=

my_built_modules :=

my_copy_dest :=

my_copy_pairs :=

my_pickup_files :=

my_missing_files :=

my_modules_and_deps :=