Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2f68bad9 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Apps-only notice file" am: cc0671f6 am: 45619343 

Original change: https://android-review.googlesource.com/c/platform/build/+/2029132

Change-Id: I9907a9ce97b9047f41504df306339ee59966b367
parents 0bd3600b 45619343

core/main.mk

+7 −7
Original line number Diff line number Diff line
@@ -1765,13 +1765,13 @@ apps_only: $(unbundled_build_modules) 


droid_targets: apps_only



# Combine the NOTICE files for a apps_only build

$(eval $(call combine-notice-files, html, \

    $(target_notice_file_txt), \

    $(target_notice_file_html_or_xml), \

    "Notices for files for apps:", \

    $(TARGET_OUT_NOTICE_FILES), \

    $(apps_only_installed_files)))

# NOTICE files for a apps_only build

$(eval $(call html-notice-rule,$(target_notice_file_html_or_xml),"Apps","Notices for files for apps:",$(unbundled_build_modules),$(PRODUCT_OUT)/ $(HOST_OUT)/))



$(eval $(call text-notice-rule,$(target_notice_file_txt),"Apps","Notices for files for apps:",$(unbundled_build_modules),$(PRODUCT_OUT)/ $(HOST_OUT)/))



$(call declare-0p-target,$(target_notice_file_txt))

$(call declare-0p-target,$(target_notice_html_or_xml_gz))





else ifeq ($(TARGET_BUILD_UNBUNDLED),$(TARGET_BUILD_UNBUNDLED_IMAGE))

core/os_licensing.mk

+4 −0
Original line number Diff line number Diff line 
ifeq ($(TARGET_BUILD_APPS),)



.PHONY: systemlicense

systemlicense: $(call corresponding-license-metadata, $(SYSTEM_NOTICE_DEPS)) reportmissinglicenses
@@ -169,3 +171,5 @@ $(call declare-0p-target,$(target_system_dlkm_notice_file_xml_gz)) 
$(call declare-0p-target,$(installed_sysetm_dlkm_notice_xml_gz))

ALL_DEFAULT_INSTALLED_MODULES += $(installed_system_dlkm_notice_xml_gz)

endif



endif # not TARGET_BUILD_APPS