StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge changes I5e684409,I4fa35540,I24015ef0 am: 93de77745c am: d1378dec05

Browse Source 
am: ead8af8580

Change-Id: I0608060da7307b9bd9a5bd15e601b1787c510dd4
This commit is contained in:
Dan Willemsen
2017-02-28 21:41:33 +00:00
committed by android-build-merger
parent 3571f256a2 ead8af8580
commit aa7e67c871
4 changed files with 4 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/tasks/tools/package-modules.mk
View File

@@ -9,6 +9,7 @@
#
#
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 :=
@@ -33,7 +34,7 @@ $(foreach m,$(my_modules_and_deps),\
$(eval _built_files := $(strip $(ALL_MODULES.$(m).BUILT_INSTALLED)\
$(ALL_MODULES.$(m)$(TARGET_2ND_ARCH_MODULE_SUFFIX).BUILT_INSTALLED)))\
$(if $(_pickup_files)$(_built_files),,\
$(warning Unknown installed file for module '$(m)'))\
$(shell $(call echo-warning,$(my_makefile),$(my_package_name): Unknown installed file for module '$(m)')))\
$(eval my_pickup_files += $(_pickup_files))\
$(foreach i, $(_built_files),\
$(eval bui_ins := $(subst :,$(space),$(i)))\