Merge "Add strict module check to package-modules.mk"

#   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)

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

# Optional input variables:

#   my_modules_strict: what happens when a module from my_modules does not exist

#     "true": error out when a module is missing

#     "false": print a warning when a module is missing

#     "": defaults to false currently

# Output variables:

# Output variables:

#   my_package_zip: the path to the output zip file.

#   my_package_zip: the path to the output zip file.

#

#

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

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_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 :=

my_missing_error :=

# Iterate over the modules and include their direct dependencies stated in the

# Iterate over the modules and include their direct dependencies stated in the

# LOCAL_REQUIRED_MODULES.

# LOCAL_REQUIRED_MODULES.

  $(eval my_modules_and_deps += $(_explicitly_required))\

  $(eval my_modules_and_deps += $(_explicitly_required))\

)

)

# Ignore unknown installed files on partial builds

ifneq ($(filter-out true false,$(my_modules_strict)),)

my_missing_files :=

  $(shell $(call echo-error,$(my_makefile),$(my_package_name): Invalid value for 'my_module_strict' = '$(my_modules_strict)'. Valid values: 'true', 'false', ''))

ifneq ($(ALLOW_MISSING_DEPENDENCIES),true)

  $(error done)

endif

my_missing_files = $(shell $(call echo-warning,$(my_makefile),$(my_package_name): Unknown installed file for module '$(1)'))

my_missing_files = $(shell $(call echo-warning,$(my_makefile),$(my_package_name): Unknown installed file for module '$(1)'))

ifeq ($(ALLOW_MISSING_DEPENDENCIES),true)

  # Ignore unknown installed files on partial builds

  my_missing_files =

else ifeq ($(my_modules_strict),true)

  my_missing_files = $(shell $(call echo-error,$(my_makefile),$(my_package_name): Unknown installed file for module '$(1)'))$(eval my_missing_error := true)

endif

endif

# Iterate over modules' built files and installed files;

# Iterate over modules' built files and installed files;

      $(eval my_copy_pairs += $(bui):$(my_staging_dir)/$(my_copy_dest)))\

      $(eval my_copy_pairs += $(bui):$(my_staging_dir)/$(my_copy_dest)))\

  ))

  ))

ifneq ($(my_missing_error),)

  $(error done)

endif

my_package_zip := $(my_staging_dir)/$(my_package_name).zip

my_package_zip := $(my_staging_dir)/$(my_package_name).zip

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

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

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

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

my_copy_pairs :=

my_copy_pairs :=

my_pickup_files :=

my_pickup_files :=

my_missing_files :=

my_missing_files :=

my_missing_error :=

my_modules_and_deps :=

my_modules_and_deps :=

my_modules_strict :=