tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Support custom my_copy_pairs in package-modules.mk" am: 5b91bd4ccb

Browse source 
am: 616764b247

Change-Id: I288d04b2e69c7f231f25905edcff19b31c6cf499
This commit is contained in:
Dan Willemsen 2017-06-21 03:00:30 +00:00 committed by android-build-merger
commit b2f7189479
2 changed files with 18 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
core/tasks/tools/build_custom_image.mk
View file

@ -144,3 +144,9 @@ custom_images $(my_custom_image_name) : $(my_installed_custom_image)
# Archive the built image. # Archive the built image.
$(call dist-for-goals, $(my_custom_image_name) custom_images,$(my_installed_custom_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 :=

14
core/tasks/tools/package-modules.mk
View file

@ -4,6 +4,7 @@
# Input variables: # Input variables:
# my_modules: a list of module names # my_modules: a list of module names
# my_package_name: the name of the output zip file. # 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: # Output variables:
# my_package_zip: the path to the output zip file. # 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_makefile := $(lastword $(filter-out $(lastword $(MAKEFILE_LIST)),$(MAKEFILE_LIST)))
my_staging_dir := $(call intermediates-dir-for,PACKAGING,$(my_package_name)) my_staging_dir := $(call intermediates-dir-for,PACKAGING,$(my_package_name))
my_built_modules := my_built_modules := $(foreach p,$(my_copy_pairs),$(call word-colon,1,$(p)))
my_copy_pairs := my_copy_pairs := $(foreach p,$(my_copy_pairs),$(call word-colon,1,$(p)):$(my_staging_dir)/$(call word-colon,2,$(p)))
my_pickup_files := my_pickup_files :=
# Iterate over the modules and include their direct dependencies stated in the # 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),\ $(hide) $(foreach f, $(PRIVATE_PICKUP_FILES),\
cp -RfL $(f) $(dir $@) && ) true cp -RfL $(f) $(dir $@) && ) true
$(hide) cd $(dir $@) && zip -rqX $(notdir $@) * $(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 :=