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

Commit 80b9546f authored by Wei Li's avatar Wei Li Committed by Gerrit Code Review
Browse files

Merge "Remove unused PRODUCT_NOTICE_SPLIT and related code" into main

parents 59ae328d 07749038

core/Makefile

+0 −11
Original line number Diff line number Diff line
@@ -1926,15 +1926,6 @@ kernel_notice_file := $(TARGET_OUT_NOTICE_FILES)/src/kernel.txt 
# need no associated notice file on the device UI.

exclude_target_dirs := apex



# TODO(b/69865032): Make PRODUCT_NOTICE_SPLIT the default behavior.

ifneq ($(PRODUCT_NOTICE_SPLIT),true)

#target_notice_file_html := $(TARGET_OUT_INTERMEDIATES)/NOTICE.html

target_notice_file_html_gz := $(TARGET_OUT_INTERMEDIATES)/NOTICE.html.gz

installed_notice_html_or_xml_gz := $(TARGET_OUT)/etc/NOTICE.html.gz



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

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

else

# target_notice_file_xml := $(TARGET_OUT_INTERMEDIATES)/NOTICE.xml

target_notice_file_xml_gz := $(TARGET_OUT_INTERMEDIATES)/NOTICE.xml.gz

installed_notice_html_or_xml_gz := $(TARGET_OUT)/etc/NOTICE.xml.gz
@@ -2054,8 +2045,6 @@ system_xml_directories := xml_system 
system_notice_file_message := "Notices for files contained in the system filesystem image in this directory:"

endif



endif # PRODUCT_NOTICE_SPLIT



ALL_DEFAULT_INSTALLED_MODULES += $(installed_notice_html_or_xml_gz)



need_vendor_notice:=false

core/config.mk

+0 −2
Original line number Diff line number Diff line
@@ -765,7 +765,6 @@ endif 


# TODO: remove all code referencing these, and remove override variables

PRODUCT_FULL_TREBLE := true

PRODUCT_NOTICE_SPLIT := true

PRODUCT_TREBLE_LINKER_NAMESPACES := true

PRODUCT_ENFORCE_VINTF_MANIFEST := true
@@ -774,7 +773,6 @@ PRODUCT_ENFORCE_VINTF_MANIFEST := true 
    PRODUCT_FULL_TREBLE \

    PRODUCT_TREBLE_LINKER_NAMESPACES \

    PRODUCT_ENFORCE_VINTF_MANIFEST \

    PRODUCT_NOTICE_SPLIT \



# TODO(b/114488870): remove all sets of these everwhere, and disallow them to be used

$(KATI_obsolete_var PRODUCT_TREBLE_LINKER_NAMESPACES_OVERRIDE,Deprecated.)

core/os_licensing.mk

+0 −7
Original line number Diff line number Diff line
@@ -7,12 +7,6 @@ ifneq (,$(SYSTEM_NOTICE_DEPS)) 


SYSTEM_NOTICE_DEPS += $(UNMOUNTED_NOTICE_DEPS) $(UNMOUNTED_NOTICE_VENDOR_DEPS)



ifneq ($(PRODUCT_NOTICE_SPLIT),true)

$(eval $(call html-notice-rule,$(target_notice_file_html_gz),"System image",$(system_notice_file_message),$(SYSTEM_NOTICE_DEPS),$(SYSTEM_NOTICE_DEPS)))



$(installed_notice_html_or_xml_gz): $(target_notice_file_html_gz)

	$(copy-file-to-target)

else

$(eval $(call xml-notice-rule,$(target_notice_file_xml_gz),"System image",$(system_notice_file_message),$(SYSTEM_NOTICE_DEPS),$(SYSTEM_NOTICE_DEPS)))



$(eval $(call text-notice-rule,$(target_notice_file_txt),"System image",$(system_notice_file_message),$(SYSTEM_NOTICE_DEPS),$(SYSTEM_NOTICE_DEPS)))
@@ -21,7 +15,6 @@ ifneq ($(PRODUCT_USE_SOONG_NOTICE_XML),true) 
$(installed_notice_html_or_xml_gz): $(target_notice_file_xml_gz)

	$(copy-file-to-target)

endif

endif



$(call declare-1p-target,$(target_notice_file_xml_gz))

ifneq ($(PRODUCT_USE_SOONG_NOTICE_XML),true)