From c3536674a9071f8344aca5a4a9b58bc76b979781 Mon Sep 17 00:00:00 2001 From: Anton Hansson Date: Mon, 25 Apr 2022 16:29:15 +0100 Subject: [PATCH] Remove notice file for sdk system image The system image itself is being removed from the sdk zip, so remove the NOTICE file for it at the same time. Bug: 205008975 Test: m sdk sdk_repo dist Change-Id: Ib75b3e5919cd203e58e03efc1cb0a378283b0c34 --- core/Makefile | 4 ---- 1 file changed, 4 deletions(-) diff --git a/core/Makefile b/core/Makefile index 8f460b440f..72929bf77c 100644 --- a/core/Makefile +++ b/core/Makefile @@ -1571,7 +1571,6 @@ ifndef TARGET_BUILD_APPS # TODO These intermediate NOTICE.txt/NOTICE.html files should go into # TARGET_OUT_NOTICE_FILES now that the notice files are gathered from # the src subdirectory. -target_notice_file_txt := $(TARGET_OUT_INTERMEDIATES)/NOTICE.txt kernel_notice_file := $(TARGET_OUT_NOTICE_FILES)/src/kernel.txt winpthreads_notice_file := $(TARGET_OUT_NOTICE_FILES)/src/winpthreads.txt @@ -6827,7 +6826,6 @@ endif include $(BUILD_SYSTEM)/sdk_font.mk deps := \ - $(target_notice_file_txt) \ $(OUT_DOCS)/offline-sdk-timestamp \ $(SDK_METADATA_FILES) \ $(SYMBOLS_ZIP) \ @@ -6887,8 +6885,6 @@ $(INTERNAL_SDK_TARGET): $(deps) -v "DLL_EXTENSION=$(HOST_SHLIB_SUFFIX)" \ -v "FONT_OUT=$(SDK_FONT_TEMP)" \ -o $(PRIVATE_DIR) && \ - cp -f $(target_notice_file_txt) \ - $(PRIVATE_DIR)/system-images/android-$(PLATFORM_VERSION)/$(TARGET_CPU_ABI)/NOTICE.txt && \ HOST_OUT_EXECUTABLES=$(HOST_OUT_EXECUTABLES) HOST_OS=$(HOST_OS) \ development/build/tools/sdk_clean.sh $(PRIVATE_DIR) && \ chmod -R ug+rwX $(PRIVATE_DIR) && \