openkylin
/
platform_build
mirror of https://gitee.com/openkylin/platform_build.git
9
0
Fork 1
Code Issues Projects Releases Wiki Activity

Merge changes I30a83721,I1094f213 

am: 85e391b2a2

Change-Id: Ieb1540a37541567b0763921d083d743d9fe30971
This commit is contained in:
Jeff Gaston 2017-11-06 22:19:38 +00:00 committed by android-build-merger
parent 212f32d7d1 85e391b2a2
commit b1a611e5fa
2 changed files with 94 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

92
core/definitions.mk
View File

@ -3190,6 +3190,98 @@ ifeq ($(TEST_MAKE_clean_path),true)
endif
endif
###########################################################
## Given a filepath, returns nonempty if the path cannot be
## validated to be contained in the current directory
## This is, this function checks for '/' and '..'
##
## $(1): path to validate
define try-validate-path-is-subdir
$(strip
$(if $(filter /%,$(1)),
$(1) starts with a slash
)
$(if $(filter ../%,$(call clean-path,$(1))),
$(1) escapes its parent using '..'
)
$(if $(strip $(1)),
,
'$(1)' is empty
)
)
endef
define validate-path-is-subdir
$(if $(call try-validate-path-is-subdir,$(1)),
$(call pretty-error, Illegal path: $(call try-validate-path-is-subdir,$(1)))
)
endef
###########################################################
## Given a space-delimited list of filepaths, returns
## nonempty if any cannot be validated to be contained in
## the current directory
##
## $(1): path list to validate
define try-validate-paths-are-subdirs
$(strip \
$(foreach my_path,$(1),\
$(call try-validate-path-is-subdir,$(my_path))\
)
)
endef
define validate-paths-are-subdirs
$(if $(call try-validate-paths-are-subdirs,$(1)),
$(call pretty-error,Illegal paths:\'$(call try-validate-paths-are-subdirs,$(1))\')
)
endef
###########################################################
## Tests of try-validate-path-is-subdir
## and try-validate-paths-are-subdirs
define test-validate-paths-are-subdirs
$(eval my_error := $(call try-validate-path-is-subdir,/tmp)) \
$(if $(call streq,$(my_error),/tmp starts with a slash),
,
$(error incorrect error message for path /tmp. Got '$(my_error)')
) \
$(eval my_error := $(call try-validate-path-is-subdir,../sibling)) \
$(if $(call streq,$(my_error),../sibling escapes its parent using '..'),
,
$(error incorrect error message for path ../sibling. Got '$(my_error)')
) \
$(eval my_error := $(call try-validate-path-is-subdir,child/../../sibling)) \
$(if $(call streq,$(my_error),child/../../sibling escapes its parent using '..'),
,
$(error incorrect error message for path child/../../sibling. Got '$(my_error)')
) \
$(eval my_error := $(call try-validate-path-is-subdir,)) \
$(if $(call streq,$(my_error),'' is empty),
,
$(error incorrect error message for empty path ''. Got '$(my_error)')
) \
$(eval my_error := $(call try-validate-path-is-subdir,subdir/subsubdir)) \
$(if $(call streq,$(my_error),),
,
$(error rejected valid path 'subdir/subsubdir'. Got '$(my_error)')
)
$(eval my_error := $(call try-validate-paths-are-subdirs,a/b /c/d e/f))
$(if $(call streq,$(my_error),/c/d starts with a slash),
,
$(error incorrect error message for path list 'a/b /c/d e/f'. Got '$(my_error)')
)
$(eval my_error := $(call try-validate-paths-are-subdirs,a/b c/d))
$(if $(call streq,$(my_error),),
,
$(error rejected valid path list 'a/b c/d'. Got '$(my_error)')
)
endef
# run test
$(strip $(call test-validate-paths-are-subdirs))
###########################################################
## Other includes
###########################################################

2
core/jacoco.mk
View File

@ -52,6 +52,8 @@ ifeq ($(LOCAL_EMMA_INSTRUMENT),true)
my_files := $(intermediates.COMMON)/jacoco
$(call validate-paths-are-subdirs,$(my_exclude_args))
# make a task that unzips the classes that we want to instrument from the
# input jar
my_unzipped_path := $(my_files)/work/classes-to-instrument/classes