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

Merge "Avoid path conflicts for the notice files"

Browse Source
This commit is contained in:
Jiyong Park
2019-11-04 09:46:42 +00:00
committed by Gerrit Code Review
parent 27fe9add1d e12c862013
commit 479cc84706
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/notice_files.mk
View File

@@ -71,8 +71,11 @@ else
# javalib.jar is the default name for the build module (and isn't meaningful) # javalib.jar is the default name for the build module (and isn't meaningful)
# If that's what we have, substitute the module name instead. These files # If that's what we have, substitute the module name instead. These files
# aren't included on the device, so this name is synthetic anyway. # aren't included on the device, so this name is synthetic anyway.
# Extra path "static" is added to try to avoid name conflict between the notice file of
# this 'uninstallable' Java module and the notice file for another 'installable' Java module
# whose stem is the same as this module's name.
ifneq ($(filter javalib.jar,$(module_leaf)),) ifneq ($(filter javalib.jar,$(module_leaf)),)
module_leaf := $(LOCAL_MODULE).jar module_leaf := static/$(LOCAL_MODULE).jar
endif endif
module_installed_filename := \ module_installed_filename := \
$(patsubst $(PRODUCT_OUT)/%,%,$($(my_prefix)OUT_JAVA_LIBRARIES))/$(module_leaf) $(patsubst $(PRODUCT_OUT)/%,%,$($(my_prefix)OUT_JAVA_LIBRARIES))/$(module_leaf)