From 0b36ca29a6f0fa26e6f4f106027144289f1d690b Mon Sep 17 00:00:00 2001 From: Nelson Li Date: Thu, 2 May 2024 05:43:21 +0000 Subject: [PATCH] Refactor product inheritance for raven products Add an additional layer of inheritance for `aosp_raven`, `aosp_raven_64`, `aosp_raven_pkvm`, `aosp_raven_pgagnostic_64`, `aosp_raven_hwasan`, and `aosp_raven_61`. This change adds a common layer of inheritance for non-factory products (raven_generic.mk). This makes it easier to configure factory and non-factory products differently. Non-factory `raven` products now inherits from `device/google/raviole/raven_generic.mk` which inherit from `device/google/raviole/device-raven.mk`. aconfig flags: Flag: EXEMPT mechanical refactoring build flags: Flag: EXEMPT mechanical refactoring Bug: 338005353 Test: lunch aosp_raven-trunk_staging-userdebug && m lunch aosp_raven_64-trunk_staging-userdebug && m lunch aosp_raven_pkvm-trunk_staging-userdebug && m lunch aosp_raven_pgagnostic_64-trunk_staging-userdebug && m lunch aosp_raven_hwasan-trunk_staging-userdebug && m lunch aosp_raven_61-trunk_staging-userdebug && m Change-Id: Id5faed5a4be4c6480ee64654203d7f7e840c5c23 --- aosp_raven.mk | 2 +- raven_generic.mk | 17 +++++++++++++++++ 2 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 raven_generic.mk diff --git a/aosp_raven.mk b/aosp_raven.mk index 6a29283..f434886 100644 --- a/aosp_raven.mk +++ b/aosp_raven.mk @@ -15,7 +15,7 @@ # $(call inherit-product, device/google/gs101/aosp_common.mk) -$(call inherit-product, device/google/raviole/device-raven.mk) +$(call inherit-product, device/google/raviole/raven_generic.mk) PRODUCT_NAME := aosp_raven PRODUCT_NAME_FOR_ATTESTATION := raven diff --git a/raven_generic.mk b/raven_generic.mk new file mode 100644 index 0000000..abbac40 --- /dev/null +++ b/raven_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/raviole/device-raven.mk)