diff options
| author | Anton Hansson <hansson@google.com> | 2022-04-25 16:29:15 +0100 |
|---|---|---|
| committer | Anton Hansson <hansson@google.com> | 2022-05-25 13:16:09 +0000 |
| commit | a0ab45384de78795aa9f778e33ae162710e0b14b (patch) | |
| tree | 26e76144485241fb69f4a5899a41d1f2c43372bb | |
| parent | c7b5e2c0cea30dd084536bdc68dffdfb1c50073d (diff) | |
| download | build-a0ab45384de78795aa9f778e33ae162710e0b14b.tar.gz | |
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
Merged-In: Ib75b3e5919cd203e58e03efc1cb0a378283b0c34
Change-Id: Ib75b3e5919cd203e58e03efc1cb0a378283b0c34
| -rw-r--r-- | core/Makefile | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/core/Makefile b/core/Makefile index 93b3e03af7..d9b4654b9d 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 @@ -6825,7 +6824,6 @@ sdk_atree_files += $(atree_dir)/sdk.atree endif deps := \ - $(target_notice_file_txt) \ $(OUT_DOCS)/offline-sdk-timestamp \ $(SDK_METADATA_FILES) \ $(SYMBOLS_ZIP) \ @@ -6882,8 +6880,6 @@ $(INTERNAL_SDK_TARGET): $(deps) -v "TARGET_CPU_ABI=$(TARGET_CPU_ABI)" \ -v "DLL_EXTENSION=$(HOST_SHLIB_SUFFIX)" \ -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) && \ |