p96705831
/
platform_build
forked from openkylin/platform_build
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Clean-up CL for CL985267. 

CL985267 was merged with one comment left unresolved. This CL resolves
that comment.

Test: Built with a pre-built vendor image and ensured additional
licenses were placed in NOTICE.xml
Test: Built with a vendor image and ensured additional licenses were
placed into NOTICE_VENDOR.xml

Change-Id: I927f09b4b501c38447702ee2fd8fdbdd5934ad20
This commit is contained in:
Chris Gross 2019-07-30 15:46:35 -07:00
parent bb039794d6
commit e5d4a9e7ff
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
core/Makefile
View File

@ -1280,16 +1280,18 @@ license_modules_agg := $(license_modules_system) \
$(license_modules_product) \
$(license_modules_system_ext) \
$(license_modules_odm)
license_modules_vendor += $(filter-out $(license_modules_agg),$(license_modules))
system_xml_directories := xml_system
system_notice_file_message := "Notices for files contained in the system filesystem image in this directory:"
license_modules_rest := $(filter-out $(license_modules_agg),$(license_modules))
# If we are building in a configuration that includes a prebuilt vendor.img, we can't
# update its notice file, so include those notices in the system partition instead
ifdef BOARD_PREBUILT_VENDORIMAGE
license_modules_system += $(filter-out $(license_modules_agg),$(license_modules))
license_modules_system += $(license_modules_rest)
system_xml_directories := xml_excluded_vendor_product_odm
system_notice_file_message := "Notices for files contained in all filesystem images except vendor/system_ext/product/odm in this directory:"
else
license_modules_vendor += $(license_modules_rest)
system_xml_directories := xml_system
system_notice_file_message := "Notices for files contained in the system filesystem image in this directory:"
endif
$(eval $(call combine-notice-files, $(system_xml_directories), \