From 0f85bf8c76db48b84487700d32959f5f3daf9ea8 Mon Sep 17 00:00:00 2001 From: Nelson Li Date: Thu, 18 Apr 2024 08:46:37 +0000 Subject: [PATCH] Refactor product inheritance for shiba products Add an additional layer of inheritance for `aosp_shiba`, `aosp_shiba_fullmte`, and `aosp_shiba_pgagnostic`. This change adds a common layer of inheritance (shiba_generic.mk) for non-factory products. This makes it easier to configure factory and non-factory products differently. Non-factory `shiba` products now inherits from `device/google/shusky/shiba_generic.mk` which inherit from `device/google/shusky/device-shiba.mk`. aconfig flags: Flag: EXEMPT mechanical refactoring build flags: Flag: EXEMPT mechanical refactoring Bug: 332219400 Bug: 335567293 Test: lunch aosp_shiba-trunk_staging-userdebug && m lunch aosp_shiba_fullmte-trunk_staging-userdebug && m lunch aosp_shiba_pgagnostic-trunk_staging-userdebug && m Change-Id: Ib825430eaf56c1395c0d955a4bbc46e5512f14b8 --- aosp_shiba.mk | 2 +- shiba_generic.mk | 17 +++++++++++++++++ 2 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 shiba_generic.mk diff --git a/aosp_shiba.mk b/aosp_shiba.mk index 04a59a7..f9ec72f 100644 --- a/aosp_shiba.mk +++ b/aosp_shiba.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-shiba.mk) +$(call inherit-product, device/google/shusky/shiba_generic.mk) PRODUCT_NAME := aosp_shiba PRODUCT_DEVICE := shiba diff --git a/shiba_generic.mk b/shiba_generic.mk new file mode 100644 index 0000000..064301e --- /dev/null +++ b/shiba_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-shiba.mk)