Merge "Remove ostensibly unused host tools notice." am: 1420aa099a
am: 67ce808a50
am: 71530d3fee
Original change: https://android-review.googlesource.com/c/platform/build/+/2000192 Change-Id: Ia35f77857335f5368c4e70bbdecb3813790fc4e4
This commit is contained in:
commit
05df4593f6
1 changed files with 0 additions and 12 deletions
|
@ -1374,8 +1374,6 @@ ifndef TARGET_BUILD_APPS
|
|||
# TARGET_OUT_NOTICE_FILES now that the notice files are gathered from
|
||||
# the src subdirectory.
|
||||
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
|
||||
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)
|
||||
|
||||
$(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
|
||||
|
||||
# The kernel isn't really a module, so to get its module file in there, we
|
||||
|
@ -6378,7 +6367,6 @@ endif
|
|||
|
||||
deps := \
|
||||
$(target_notice_file_txt) \
|
||||
$(tools_notice_file_txt) \
|
||||
$(OUT_DOCS)/offline-sdk-timestamp \
|
||||
$(SDK_METADATA_FILES) \
|
||||
$(SYMBOLS_ZIP) \
|
||||
|
|
Loading…
Reference in a new issue