From c30b3ddd5332a39d75a6db5d3573b4c51ac4f6a8 Mon Sep 17 00:00:00 2001 From: Nelson Li Date: Mon, 22 Apr 2024 07:56:11 +0000 Subject: [PATCH] Refactor product inheritance for husky products Add an additional layer of inheritance for `aosp_husky`, `aosp_husky_pgagnostic`, and `aosp_husky_fullmte`. This change adds a common layer of inheritance (husky_generic.mk) for non-factory products. This makes it easier to configure factory and non-factory products differently. Non-factory `husky` products now inherits from `device/google/shusky/husky_generic.mk` which inherit from `device/google/shusky/device-husky.mk`. aconfig flags: Flag: EXEMPT mechanical refactoring build flags: Flag: EXEMPT mechanical refactoring Bug: 332219400 Bug: 335567236 Test: lunch aosp_husky-trunk_staging-userdebug && m lunch aosp_husky_pgagnostic-trunk_staging-userdebug && m lunch aosp_husky_fullmte-trunk_staging-userdebug && m Change-Id: Ia4b4c63d12343862655f208cec48995cc2e3a672 --- aosp_husky.mk | 2 +- husky_generic.mk | 17 +++++++++++++++++ 2 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 husky_generic.mk diff --git a/aosp_husky.mk b/aosp_husky.mk index 3ea1b08..47cf99b 100644 --- a/aosp_husky.mk +++ b/aosp_husky.mk @@ -20,7 +20,7 @@ USE_SWIFTSHADER := true BOARD_USES_SWIFTSHADER := true $(call inherit-product, device/google/zuma/aosp_common.mk) -$(call inherit-product, device/google/shusky/device-husky.mk) +$(call inherit-product, device/google/shusky/husky_generic.mk) PRODUCT_NAME := aosp_husky PRODUCT_DEVICE := husky diff --git a/husky_generic.mk b/husky_generic.mk new file mode 100644 index 0000000..2bf7caf --- /dev/null +++ b/husky_generic.mk @@ -0,0 +1,17 @@ +# +# Copyright 2024 The Android Open-Source Project +# +# 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. +# + +$(call inherit-product, device/google/shusky/device-husky.mk)