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
This commit is contained in:
Nelson Li 2024-04-18 08:46:37 +00:00
parent 515a7dbe70
commit 0f85bf8c76
2 changed files with 18 additions and 1 deletions

View file

@ -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

17
shiba_generic.mk Normal file
View file

@ -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)