diff --git a/AndroidProducts.mk b/AndroidProducts.mk index db89ed1..908938b 100644 --- a/AndroidProducts.mk +++ b/AndroidProducts.mk @@ -16,8 +16,4 @@ PRODUCT_MAKEFILES := \ $(LOCAL_DIR)/aosp_comet.mk \ - $(LOCAL_DIR)/factory_comet.mk \ $(LOCAL_DIR)/lineage_comet.mk - -COMMON_LUNCH_CHOICES := \ - aosp_comet-trunk_staging-userdebug diff --git a/aosp_comet.mk b/aosp_comet.mk index 3298e82..4392979 100644 --- a/aosp_comet.mk +++ b/aosp_comet.mk @@ -17,7 +17,7 @@ TARGET_LINUX_KERNEL_VERSION := 6.1 $(call inherit-product, device/google/zumapro/aosp_common.mk) -$(call inherit-product, device/google/comet/comet_generic.mk) +$(call inherit-product, device/google/comet/device-comet.mk) PRODUCT_NAME := aosp_comet PRODUCT_DEVICE := comet diff --git a/audio/comet/config/mixer_paths_factory.xml b/audio/comet/config/mixer_paths_factory.xml deleted file mode 100644 index 1098cd8..0000000 --- a/audio/comet/config/mixer_paths_factory.xml +++ /dev/null @@ -1,470 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/audio/comet/factory-audio-tables.mk b/audio/comet/factory-audio-tables.mk deleted file mode 100644 index 93fe95e..0000000 --- a/audio/comet/factory-audio-tables.mk +++ /dev/null @@ -1,22 +0,0 @@ -# -# Copyright (C) 2020 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. -# - -AUDIO_FACTORY_TABLE_FOLDER := comet - -# Mixer Path Configuration for Audio Factory -PRODUCT_COPY_FILES += \ - device/google/comet/audio/$(AUDIO_FACTORY_TABLE_FOLDER)/config/mixer_paths_factory.xml:$(TARGET_COPY_OUT_VENDOR)/etc/mixer_paths_factory.xml - diff --git a/comet/BoardConfig.mk b/comet/BoardConfig.mk index aa948b9..470079b 100644 --- a/comet/BoardConfig.mk +++ b/comet/BoardConfig.mk @@ -13,7 +13,6 @@ # See the License for the specific language governing permissions and # limitations under the License. # -ifeq (,$(filter %comet23,$(PRODUCT_NAME))) TARGET_BOARD_INFO_FILE := device/google/comet/board-info.txt TARGET_BOOTLOADER_BOARD_NAME := comet @@ -39,12 +38,6 @@ ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT))) -include device/google/common/etm/6_1/BoardUserdebugModules.mk endif -else - -include device/google/comet23/comet23/BoardConfig.mk - -endif - DEVICE_PATH := device/google/comet VENDOR_PATH := vendor/google/comet include $(DEVICE_PATH)/$(TARGET_BOOTLOADER_BOARD_NAME)/BoardConfigLineage.mk diff --git a/comet_generic.mk b/comet_generic.mk deleted file mode 100644 index cf5ef0e..0000000 --- a/comet_generic.mk +++ /dev/null @@ -1,20 +0,0 @@ -# -# 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/comet/device-comet.mk) - -# preloaded_nanoapps.json -PRODUCT_SOONG_NAMESPACES += vendor/google_contexthub/devices/p24_common diff --git a/device-comet.mk b/device-comet.mk index 6645706..fd27bc3 100644 --- a/device-comet.mk +++ b/device-comet.mk @@ -47,9 +47,7 @@ LOCAL_PATH := device/google/comet ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT))) USE_UWBFIELDTESTQM := true endif -ifeq ($(filter factory_comet, $(TARGET_PRODUCT)),) - include device/google/comet/uwb/uwb_calibration.mk -endif +include device/google/comet/uwb/uwb_calibration.mk $(call inherit-product-if-exists, vendor/google_devices/comet/prebuilts/device-vendor-comet.mk) $(call inherit-product-if-exists, vendor/google_devices/zumapro/prebuilts/device-vendor.mk) @@ -58,10 +56,6 @@ $(call inherit-product-if-exists, vendor/google_devices/comet/proprietary/device $(call inherit-product-if-exists, vendor/google_devices/comet/proprietary/comet/device-vendor-comet.mk) $(call inherit-product-if-exists, vendor/qorvo/uwb/qm35-hal/Device.mk) -ifeq ($(filter factory_comet, $(TARGET_PRODUCT)),) - $(call inherit-product-if-exists, vendor/google_devices/comet/proprietary/WallpapersComet.mk) -endif - DEVICE_PACKAGE_OVERLAYS += device/google/comet/comet/overlay ifeq ($(RELEASE_PIXEL_AIDL_AUDIO_HAL),true) @@ -128,12 +122,10 @@ PRODUCT_COPY_FILES += \ device/google/comet/comet/panel_config_google-ct3d_cal1.pb:$(TARGET_COPY_OUT_VENDOR)/etc/panel_config_google-ct3d_cal1.pb \ device/google/comet/comet/panel_config_google-ct3e_cal1.pb:$(TARGET_COPY_OUT_VENDOR)/etc/panel_config_google-ct3e_cal1.pb -ifeq ($(filter factory_comet, $(TARGET_PRODUCT)),) PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.vendor.primarydisplay.xrr.version=2.1 PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.vendor.primarydisplay.blocking_zone.min_refresh_rate_by_nits=20:120,30:60,:1 PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.vendor.primarydisplay.vrr.expected_present.headsup_ns=30000000 PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.vendor.primarydisplay.vrr.expected_present.timeout_ns=500000000 -endif PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.vendor.primarydisplay.powerstats.entity_name=Inner-Display diff --git a/factory_comet.mk b/factory_comet.mk deleted file mode 100644 index c72079b..0000000 --- a/factory_comet.mk +++ /dev/null @@ -1,53 +0,0 @@ -# -# Copyright 2021 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. -# - -TARGET_LINUX_KERNEL_VERSION := 6.1 - -$(call inherit-product, device/google/zumapro/factory_common.mk) -$(call inherit-product, device/google/comet/device-comet.mk) -include device/google/comet/audio/comet/factory-audio-tables.mk - -PRODUCT_NAME := factory_comet -PRODUCT_DEVICE := comet -PRODUCT_MODEL := Factory build on Comet -PRODUCT_BRAND := Android -PRODUCT_MANUFACTURER := Google - -# default BDADDR for EVB only -PRODUCT_PROPERTY_OVERRIDES += \ - ro.vendor.bluetooth.evb_bdaddr="22:22:22:33:44:55" - -# Location -PRODUCT_PACKAGES += \ - sctd \ - spad \ - swcnd \ - libmptool_json \ - libmptool_log \ - libmptool_utils \ - sctd.json \ - spad.json \ - swcnd.json \ - android.hardware.gnss@2.1-impl - -# Factory binary of camera -PRODUCT_PACKAGES += fatp_ct3_wide_hat_tool fatp_ct3_tele_hat_tool fatp_ct3_ultrawide_hat_tool -PRODUCT_PACKAGES += fatp_camera_eeprom_inspector - -PRODUCT_WITHOUT_TTS_VOICE_PACKS := true - -# preloaded_nanoapps.json -PRODUCT_SOONG_NAMESPACES += vendor/google_contexthub/devices/factory