shusky: Refactor camera HAL build configuration.

Introduced CAMERA_PRODUCT variable. This variable is designed to be
overridable from child product .mk files. Provided default values for
each devices as well.

Bug: 297430678
Test: Build on each shusky devices, check output Soong config vars.
Change-Id: Iee5c8a79d95c62be3ec368c91ad5d4998b001102
This commit is contained in:
Firman Prayoga 2023-08-28 02:52:12 +00:00
parent ce991e6468
commit f64dda5552
4 changed files with 32 additions and 15 deletions

24
camera/camera.mk Normal file
View file

@ -0,0 +1,24 @@
#
# Copyright (C) 2023 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.
#
ifeq ($(CAMERA_PRODUCT),)
$(error CAMERA_PRODUCT is not set.)
endif
# go/lyric-soong-variables
$(call soong_config_set,lyric,camera_hardware,$(CAMERA_PRODUCT))
$(call soong_config_set,lyric,tuning_product,$(CAMERA_PRODUCT))
$(call soong_config_set,google3a_config,target_device,$(CAMERA_PRODUCT))

View file

@ -42,7 +42,10 @@ PRODUCT_COPY_FILES += \
device/google/shusky/husky/display_colordata_dev_cal0.pb:$(TARGET_COPY_OUT_VENDOR)/etc/display_colordata_dev_cal0.pb \ device/google/shusky/husky/display_colordata_dev_cal0.pb:$(TARGET_COPY_OUT_VENDOR)/etc/display_colordata_dev_cal0.pb \
device/google/shusky/husky/display_golden_google-hk3_cal0.pb:$(TARGET_COPY_OUT_VENDOR)/etc/display_golden_google-hk3_cal0.pb device/google/shusky/husky/display_golden_google-hk3_cal0.pb:$(TARGET_COPY_OUT_VENDOR)/etc/display_golden_google-hk3_cal0.pb
CAMERA_PRODUCT ?= husky
include device/google/shusky/audio/husky/audio-tables.mk include device/google/shusky/audio/husky/audio-tables.mk
include device/google/shusky/camera/camera.mk
include device/google/zuma/device-shipping-common.mk include device/google/zuma/device-shipping-common.mk
include hardware/google/pixel/vibrator/cs40l26/device.mk include hardware/google/pixel/vibrator/cs40l26/device.mk
include device/google/gs-common/bcmbt/bluetooth.mk include device/google/gs-common/bcmbt/bluetooth.mk
@ -50,11 +53,6 @@ include device/google/gs-common/touch/stm/stm20.mk
include device/google/gs-common/touch/gti/gti.mk include device/google/gs-common/touch/gti/gti.mk
include device/google/gs-common/touch/touchinspector/touchinspector.mk include device/google/gs-common/touch/touchinspector/touchinspector.mk
# go/lyric-soong-variables
$(call soong_config_set,lyric,camera_hardware,husky)
$(call soong_config_set,lyric,tuning_product,husky)
$(call soong_config_set,google3a_config,target_device,husky)
# Init files # Init files
PRODUCT_COPY_FILES += \ PRODUCT_COPY_FILES += \
device/google/shusky/conf/init.husky.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.husky.rc device/google/shusky/conf/init.husky.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.husky.rc

View file

@ -30,18 +30,16 @@ $(call inherit-product-if-exists, vendor/google_devices/zuma/proprietary/device-
$(call inherit-product-if-exists, vendor/google_devices/shusky/proprietary/ripcurrent/device-vendor-ripcurrent.mk) $(call inherit-product-if-exists, vendor/google_devices/shusky/proprietary/ripcurrent/device-vendor-ripcurrent.mk)
$(call inherit-product-if-exists, vendor/qorvo/uwb/qm35-hal/Device.mk) $(call inherit-product-if-exists, vendor/qorvo/uwb/qm35-hal/Device.mk)
CAMERA_PRODUCT ?= ripcurrent
include device/google/shusky/audio/ripcurrent/audio-tables.mk include device/google/shusky/audio/ripcurrent/audio-tables.mk
include device/google/shusky/camera/camera.mk
include device/google/zuma/device-shipping-common.mk include device/google/zuma/device-shipping-common.mk
include hardware/google/pixel/vibrator/cs40l26/device-stereo.mk include hardware/google/pixel/vibrator/cs40l26/device-stereo.mk
include device/google/gs-common/bcmbt/bluetooth.mk include device/google/gs-common/bcmbt/bluetooth.mk
include device/google/gs-common/gps/brcm/cbd_gps.mk include device/google/gs-common/gps/brcm/cbd_gps.mk
include device/google/gs-common/touch/stm/stm20.mk include device/google/gs-common/touch/stm/stm20.mk
# go/lyric-soong-variables
$(call soong_config_set,lyric,camera_hardware,ripcurrent)
$(call soong_config_set,lyric,tuning_product,ripcurrent)
$(call soong_config_set,google3a_config,target_device,ripcurrent)
# display # display
DEVICE_PACKAGE_OVERLAYS += device/google/shusky/ripcurrent/overlay DEVICE_PACKAGE_OVERLAYS += device/google/shusky/ripcurrent/overlay

View file

@ -30,18 +30,15 @@ $(call inherit-product-if-exists, vendor/google_devices/shiba/proprietary/device
$(call inherit-product-if-exists, vendor/google_devices/shusky/proprietary/WallpapersShiba.mk) $(call inherit-product-if-exists, vendor/google_devices/shusky/proprietary/WallpapersShiba.mk)
DEVICE_PACKAGE_OVERLAYS += device/google/shusky/shiba/overlay DEVICE_PACKAGE_OVERLAYS += device/google/shusky/shiba/overlay
CAMERA_PRODUCT ?= shiba
include device/google/shusky/audio/shiba/audio-tables.mk include device/google/shusky/audio/shiba/audio-tables.mk
include device/google/shusky/camera/camera.mk
include device/google/zuma/device-shipping-common.mk include device/google/zuma/device-shipping-common.mk
include hardware/google/pixel/vibrator/cs40l26/device.mk include hardware/google/pixel/vibrator/cs40l26/device.mk
include device/google/gs-common/bcmbt/bluetooth.mk include device/google/gs-common/bcmbt/bluetooth.mk
include device/google/gs-common/touch/gti/gti.mk include device/google/gs-common/touch/gti/gti.mk
# go/lyric-soong-variables
$(call soong_config_set,lyric,camera_hardware,shiba)
$(call soong_config_set,lyric,tuning_product,shiba)
$(call soong_config_set,google3a_config,target_device,shiba)
# Init files # Init files
PRODUCT_COPY_FILES += \ PRODUCT_COPY_FILES += \
device/google/shusky/conf/init.shiba.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.shiba.rc device/google/shusky/conf/init.shiba.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.shiba.rc