From 10120f1db2f127f756777f85cb107085da7118e8 Mon Sep 17 00:00:00 2001 From: Nelson Li Date: Thu, 19 Sep 2024 07:19:25 +0000 Subject: [PATCH] Move the `dist` target of `mke2fs` to `build/core/tasks` Because `mke2fs`, `make_f2fs`, and `make_f2fs_casefold` have `recovery_available` set to true, Soong forcibly adds a new variation with a `_recovery` suffix to the existing variations. If this is directly added to the `dist` of the corresponding module, it will cause duplication of the `android_recovery_/meta_lic` and `android_/meta_lic` files. Therefore, it is temporarily moved to `build/core/tasks`. Once the issues are resolved, they will be moved to the corresponding modules. Bug: 349741178 Test: m sdk dist Change-Id: Id003f6aed85c909aeb36606691cc4daf10c9c1d4 --- fastboot/Android.mk | 25 ------------------------- 1 file changed, 25 deletions(-) delete mode 100644 fastboot/Android.mk diff --git a/fastboot/Android.mk b/fastboot/Android.mk deleted file mode 100644 index cde0cb28e..000000000 --- a/fastboot/Android.mk +++ /dev/null @@ -1,25 +0,0 @@ -# Copyright (C) 2007 Google Inc. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -LOCAL_PATH:= $(call my-dir) - -# -# Package fastboot-related executables. -# - -my_dist_files := $(HOST_OUT_EXECUTABLES)/mke2fs -my_dist_files += $(HOST_OUT_EXECUTABLES)/make_f2fs -my_dist_files += $(HOST_OUT_EXECUTABLES)/make_f2fs_casefold -$(call dist-for-goals,dist_files sdk,$(my_dist_files)) -my_dist_files :=