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

Merge "Skip unneeded notice files for DATA modules."

This commit is contained in:
Treehugger Robot 2020-10-08 02:17:18 +00:00 committed by Gerrit Code Review
parent 09da8b1ba1 a16690c38c
commit 3592aedd78
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
core/notice_files.mk
View File

@ -79,8 +79,9 @@ else
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)
else ifeq ($(LOCAL_MODULE_CLASS),ETC) else ifneq ($(filter ETC DATA,$(LOCAL_MODULE_CLASS)),)
# ETC modules may be uninstallable, yet still have a NOTICE file. e.g. apex components # ETC and DATA modules may be uninstallable, yet still have a NOTICE file.
# e.g. apex components
module_installed_filename := module_installed_filename :=
else ifneq (,$(and $(filter %.sdk,$(LOCAL_MODULE)),$(filter $(patsubst %.sdk,%,$(LOCAL_MODULE)),$(SOONG_SDK_VARIANT_MODULES)))) else ifneq (,$(and $(filter %.sdk,$(LOCAL_MODULE)),$(filter $(patsubst %.sdk,%,$(LOCAL_MODULE)),$(SOONG_SDK_VARIANT_MODULES))))
# Soong produces uninstallable *.sdk shared libraries for embedding in APKs. # Soong produces uninstallable *.sdk shared libraries for embedding in APKs.