From f5c81992dbf8d6a6854ec0de001bdda947cb220a Mon Sep 17 00:00:00 2001 From: Nelson Li Date: Thu, 25 Apr 2024 08:58:21 +0000 Subject: [PATCH] Refactor product inheritance for tokay products Add an additional layer of inheritance for `factory_tokay`, `aosp_tokay`, and `aosp_tokay_fullmte`. This change adds a common layer of inheritance for non-factory products (tokay_generic.mk). This makes it easier to configure factory and non-factory products differently. Non-factory `tokay` products now inherits from `device/google/caimito/tokay_generic.mk` which inherit from `device/google/caimito/device-tokay.mk`. aconfig flags: Flag: EXEMPT mechanical refactoring build flags: Flag: EXEMPT mechanical refactoring Bug: 336452008 Bug: 336706866 Test: lunch aosp_tokay-trunk_staging-userdebug && m lunch aosp_tokay_fullmte-trunk_staging-userdebug && m Change-Id: Ided24b5d180bcfdf8ff2b1f9964fa42c0c53ef99 --- aosp_tokay.mk | 2 +- tokay_generic.mk | 17 +++++++++++++++++ 2 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 tokay_generic.mk diff --git a/aosp_tokay.mk b/aosp_tokay.mk index 4be83a02..7eb10a63 100644 --- a/aosp_tokay.mk +++ b/aosp_tokay.mk @@ -20,7 +20,7 @@ USE_SWIFTSHADER := false BOARD_USES_SWIFTSHADER := false $(call inherit-product, device/google/zumapro/aosp_common.mk) -$(call inherit-product, device/google/caimito/device-tokay.mk) +$(call inherit-product, device/google/caimito/tokay_generic.mk) PRODUCT_NAME := aosp_tokay PRODUCT_DEVICE := tokay diff --git a/tokay_generic.mk b/tokay_generic.mk new file mode 100644 index 00000000..0b1cd22f --- /dev/null +++ b/tokay_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/caimito/device-tokay.mk)