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

Merge "Revert "Support <dir>:<file> for LOCAL_JAVA_RESOURCE_FILES""

Browse source 
am: 7d607a1917

Change-Id: Iad553437753e78131e34da89bb61a2b75ac4f796
This commit is contained in:
Colin Cross 2017-09-22 20:53:44 +00:00 committed by android-build-merger
commit 0b42833ae3
1 changed files with 5 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
core/java_common.mk
View file

@ -105,18 +105,12 @@ ifneq ($(LOCAL_JAVA_RESOURCE_DIRS),)
java_resource_file_groups := $(filter-out %:,$(java_resource_file_groups))
endif # LOCAL_JAVA_RESOURCE_DIRS
LOCAL_JAVA_RESOURCE_FILES := $(strip $(LOCAL_JAVA_RESOURCE_FILES))
ifneq ($(LOCAL_JAVA_RESOURCE_FILES),)
# Converts LOCAL_JAVA_RESOURCE_FILES := <file> to $(dir $(file))::$(notdir $(file))
# and LOCAL_JAVA_RESOURCE_FILES := <dir>:<file> to <dir>::<file>
java_resource_file_groups += $(strip $(foreach res,$(LOCAL_JAVA_RESOURCE_FILES), \
$(eval _file := $(call word-colon,2,$(res))) \
$(if $(_file), \
$(eval _base := $(call word-colon,1,$(res))), \
$(eval _base := $(dir $(res))) \
$(eval _file := $(notdir $(res)))) \
$(if $(filter /%,$(_base) $(_file)),$(call pretty-error,LOCAL_JAVA_RESOURCE_FILES may not include absolute paths: $(_base) $(_file))) \
$(patsubst %/,%,$(_base))::$(_file)))
java_resource_file_groups += \
$(foreach f,$(LOCAL_JAVA_RESOURCE_FILES), \
$(patsubst %/,%,$(dir $(f)))::$(notdir $(f)) \
)
endif # LOCAL_JAVA_RESOURCE_FILES
ifdef java_resource_file_groups