From 21ba377f5a10518e9d5857d63de1e1ded1704b47 Mon Sep 17 00:00:00 2001 From: Nelson Li Date: Thu, 19 Sep 2024 07:14:50 +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: I1bea3aa2f42334c9ed14bf766aaa7e6f428ed35a --- core/tasks/mke2fs-dist.mk | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 core/tasks/mke2fs-dist.mk diff --git a/core/tasks/mke2fs-dist.mk b/core/tasks/mke2fs-dist.mk new file mode 100644 index 0000000000..3540c1f985 --- /dev/null +++ b/core/tasks/mke2fs-dist.mk @@ -0,0 +1,22 @@ +# Copyright (C) 2024 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. + +# TODO: After Soong's recovery partition variation can be set to selectable +# and the meta_lic file duplication issue is resolved, move it to the +# dist section of the corresponding module's Android.bp. +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 :=