| changeset 15062 | 0c0ce0e5a112 |
| parent 15051 | d32ad37472e6 |
| child 15393 | e3761cf4e010 |
| 15061:9c6c6c6628cf | 15062:0c0ce0e5a112 |
|---|---|
248 endef |
248 endef |
249 |
249 |
250 define SetupZipArchive |
250 define SetupZipArchive |
251 # param 1 is for example ZIP_MYSOURCE |
251 # param 1 is for example ZIP_MYSOURCE |
252 # param 2,3,4,5,6,7,8,9 are named args. |
252 # param 2,3,4,5,6,7,8,9 are named args. |
253 # SRC,ZIP,INCLUDES,EXCLUDES,EXCLUDE_FILES,SUFFIXES,EXTRA_DEPS |
253 # SRC,ZIP,INCLUDES,INCLUDE_FILES,EXCLUDES,EXCLUDE_FILES,SUFFIXES,EXTRA_DEPS |
254 $(foreach i,2 3 4 5 6 7 8 9 10 11 12 13 14 15, $(if $($i),$1_$(strip $($i)))$(NEWLINE)) |
254 $(foreach i,2 3 4 5 6 7 8 9 10 11 12 13 14 15, $(if $($i),$1_$(strip $($i)))$(NEWLINE)) |
255 $(call LogSetupMacroEntry,SetupZipArchive($1),$2,$3,$4,$5,$6,$7,$8,$9,$(10),$(11),$(12),$(13),$(14),$(15)) |
255 $(call LogSetupMacroEntry,SetupZipArchive($1),$2,$3,$4,$5,$6,$7,$8,$9,$(10),$(11),$(12),$(13),$(14),$(15)) |
256 $(if $(16),$(error Internal makefile error: Too many arguments to SetupZipArchive, please update JavaCompilation.gmk)) |
256 $(if $(16),$(error Internal makefile error: Too many arguments to SetupZipArchive, please update JavaCompilation.gmk)) |
257 |
257 |
258 # Find all files in the source tree. |
258 # Find all files in the source tree. |
265 $1_ZIP_INCLUDES := $$(foreach s,$$($1_SUFFIXES),\ |
265 $1_ZIP_INCLUDES := $$(foreach s,$$($1_SUFFIXES),\ |
266 $$(addprefix -i$(SPACE)$(DQUOTE),$$(addsuffix /*$$s$(DQUOTE),$$($1_INCLUDES)))) |
266 $$(addprefix -i$(SPACE)$(DQUOTE),$$(addsuffix /*$$s$(DQUOTE),$$($1_INCLUDES)))) |
267 else |
267 else |
268 $1_ZIP_INCLUDES := $$(addprefix -i$(SPACE)$(DQUOTE),$$(addsuffix /*$(DQUOTE),$$($1_INCLUDES))) |
268 $1_ZIP_INCLUDES := $$(addprefix -i$(SPACE)$(DQUOTE),$$(addsuffix /*$(DQUOTE),$$($1_INCLUDES))) |
269 endif |
269 endif |
270 endif |
|
271 ifneq ($$($1_INCLUDE_FILES),) |
|
272 $1_SRC_INCLUDES += $$(foreach i,$$($1_SRC),$$(addprefix $$i/,$$($1_INCLUDE_FILES))) |
|
273 $1_ZIP_INCLUDES += $$(addprefix -i$(SPACE),$$($1_INCLUDE_FILES)) |
|
274 endif |
|
275 ifneq ($$($1_SRC_INCLUDES),) |
|
270 $1_ALL_SRCS := $$(filter $$($1_SRC_INCLUDES),$$($1_ALL_SRCS)) |
276 $1_ALL_SRCS := $$(filter $$($1_SRC_INCLUDES),$$($1_ALL_SRCS)) |
271 endif |
277 endif |
272 ifneq ($$($1_EXCLUDES),) |
278 ifneq ($$($1_EXCLUDES),) |
273 $1_SRC_EXCLUDES := $$(foreach i,$$($1_SRC),$$(addprefix $$i/,$$(addsuffix /%,$$($1_EXCLUDES)))) |
279 $1_SRC_EXCLUDES := $$(foreach i,$$($1_SRC),$$(addprefix $$i/,$$(addsuffix /%,$$($1_EXCLUDES)))) |
274 $1_ZIP_EXCLUDES := $$(addprefix -x$(SPACE)$(DQUOTE),$$(addsuffix /*$(DQUOTE),$$($1_EXCLUDES))) |
280 $1_ZIP_EXCLUDES := $$(addprefix -x$(SPACE)$(DQUOTE),$$(addsuffix /*$(DQUOTE),$$($1_EXCLUDES))) |