StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove ostensibly unused host tools notice." am: 1420aa099a

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/+/2000192

Change-Id: I7a39d4f3cd5fa70159770e53e8f30567f43b1357
This commit is contained in:
Treehugger Robot
2022-02-25 18:58:51 +00:00
committed by Automerger Merge Worker
parent 474339443f 1420aa099a
commit 67ce808a50
1 changed files with 0 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
core/Makefile
View File

@@ -1374,8 +1374,6 @@ ifndef TARGET_BUILD_APPS
# TARGET_OUT_NOTICE_FILES now that the notice files are gathered from # TARGET_OUT_NOTICE_FILES now that the notice files are gathered from
# the src subdirectory. # the src subdirectory.
target_notice_file_txt := $(TARGET_OUT_INTERMEDIATES)/NOTICE.txt target_notice_file_txt := $(TARGET_OUT_INTERMEDIATES)/NOTICE.txt
tools_notice_file_txt := $(HOST_OUT_INTERMEDIATES)/NOTICE.txt
tools_notice_file_html := $(HOST_OUT_INTERMEDIATES)/NOTICE.html
kernel_notice_file := $(TARGET_OUT_NOTICE_FILES)/src/kernel.txt kernel_notice_file := $(TARGET_OUT_NOTICE_FILES)/src/kernel.txt
winpthreads_notice_file := $(TARGET_OUT_NOTICE_FILES)/src/winpthreads.txt winpthreads_notice_file := $(TARGET_OUT_NOTICE_FILES)/src/winpthreads.txt
@@ -1641,15 +1639,6 @@ endif # PRODUCT_NOTICE_SPLIT
ALL_DEFAULT_INSTALLED_MODULES += $(installed_notice_html_or_xml_gz) ALL_DEFAULT_INSTALLED_MODULES += $(installed_notice_html_or_xml_gz)
$(eval $(call combine-notice-files, html, \
$(tools_notice_file_txt), \
$(tools_notice_file_html), \
"Notices for files contained in the tools directory:", \
$(HOST_OUT_NOTICE_FILES), \
$(ALL_DEFAULT_INSTALLED_MODULES) \
$(winpthreads_notice_file), \
$(exclude_target_dirs)))
endif # TARGET_BUILD_APPS endif # TARGET_BUILD_APPS
# The kernel isn't really a module, so to get its module file in there, we # The kernel isn't really a module, so to get its module file in there, we
@@ -6380,7 +6369,6 @@ include $(BUILD_SYSTEM)/sdk_font.mk
deps := \ deps := \
$(target_notice_file_txt) \ $(target_notice_file_txt) \
$(tools_notice_file_txt) \
$(OUT_DOCS)/offline-sdk-timestamp \ $(OUT_DOCS)/offline-sdk-timestamp \
$(SDK_METADATA_FILES) \ $(SDK_METADATA_FILES) \
$(SYMBOLS_ZIP) \ $(SYMBOLS_ZIP) \