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

Merge "Clean-up CL for CL985267."

Browse source 
am: 04bc250d88

Change-Id: I9005b48c374811a207bcf6a0ff0edd50128da380
This commit is contained in:
Chris Gross 2019-07-31 09:43:49 -07:00 committed by android-build-merger
commit 9300d27562
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

@ -1281,16 +1281,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), \