diff --git a/AndroidProducts.mk b/AndroidProducts.mk index 755039a..f97df09 100644 --- a/AndroidProducts.mk +++ b/AndroidProducts.mk @@ -16,9 +16,4 @@ PRODUCT_MAKEFILES := \ $(LOCAL_DIR)/aosp_bluejay.mk \ - $(LOCAL_DIR)/aosp_bluejay_hwasan.mk \ - $(LOCAL_DIR)/factory_bluejay.mk \ $(LOCAL_DIR)/lineage_bluejay.mk - -COMMON_LUNCH_CHOICES := \ - aosp_bluejay-trunk_staging-userdebug diff --git a/aosp_bluejay_hwasan.mk b/aosp_bluejay_hwasan.mk deleted file mode 100644 index a9d080b..0000000 --- a/aosp_bluejay_hwasan.mk +++ /dev/null @@ -1,23 +0,0 @@ -# -# Copyright 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. -# - -$(call inherit-product, device/google/bluejay/aosp_bluejay.mk) -PRODUCT_NAME := aosp_bluejay_hwasan - -# Add "hwaddress" as a global sanitizer if it's missing. -ifeq ($(filter hwaddress,$(SANITIZE_TARGET)),) - SANITIZE_TARGET := $(strip $(SANITIZE_TARGET) hwaddress) -endif diff --git a/audio/bluejay/config/mixer_paths_factory.xml b/audio/bluejay/config/mixer_paths_factory.xml deleted file mode 100644 index e68aa88..0000000 --- a/audio/bluejay/config/mixer_paths_factory.xml +++ /dev/null @@ -1,305 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/audio/bluejay/factory-audio-tables.mk b/audio/bluejay/factory-audio-tables.mk deleted file mode 100644 index 8bcbaea..0000000 --- a/audio/bluejay/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 := bluejay - -# Mixer Path Configuration for Audio Factory -PRODUCT_COPY_FILES += \ - device/google/bluejay/audio/$(AUDIO_FACTORY_TABLE_FOLDER)/config/mixer_paths_factory.xml:$(TARGET_COPY_OUT_VENDOR)/etc/mixer_paths_factory.xml - diff --git a/device-bluejay.mk b/device-bluejay.mk index 221d6b7..d8130a6 100644 --- a/device-bluejay.mk +++ b/device-bluejay.mk @@ -41,11 +41,7 @@ include device/google/gs-common/touch/stm/stm11.mk # Fingerprint HAL GOODIX_CONFIG_BUILD_VERSION := g7_trusty $(call inherit-product-if-exists, vendor/goodix/udfps/configuration/udfps_common.mk) -ifeq ($(filter factory%, $(TARGET_PRODUCT)),) $(call inherit-product-if-exists, vendor/goodix/udfps/configuration/udfps_shipping.mk) -else -$(call inherit-product-if-exists, vendor/goodix/udfps/configuration/udfps_factory.mk) -endif # go/lyric-soong-variables $(call soong_config_set,lyric,camera_hardware,bluejay) diff --git a/factory_bluejay.mk b/factory_bluejay.mk deleted file mode 100644 index f5efaa3..0000000 --- a/factory_bluejay.mk +++ /dev/null @@ -1,34 +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. -# - -$(call inherit-product, device/google/gs101/factory_common.mk) -$(call inherit-product, device/google/bluejay/device-bluejay.mk) -include device/google/bluejay/audio/bluejay/factory-audio-tables.mk - -PRODUCT_NAME := factory_bluejay -PRODUCT_DEVICE := bluejay -PRODUCT_MODEL := Factory build on Bluejay -PRODUCT_BRAND := Android -PRODUCT_MANUFACTURER := Google - -DEVICE_PACKAGE_OVERLAYS += device/google/bluejay/factory_bluejay/overlay - -# default BDADDR for EVB only -PRODUCT_PROPERTY_OVERRIDES += \ - ro.vendor.bluetooth.evb_bdaddr="22:22:22:33:44:55" - -# Factory binary of camera -PRODUCT_PACKAGES += fatp_imx363_hat_tool diff --git a/factory_bluejay/overlay/frameworks/base/core/res/res/values/config.xml b/factory_bluejay/overlay/frameworks/base/core/res/res/values/config.xml deleted file mode 100644 index 126c3fc..0000000 --- a/factory_bluejay/overlay/frameworks/base/core/res/res/values/config.xml +++ /dev/null @@ -1,36 +0,0 @@ - - - - - - - 0:2:15 - - - - - 540 - 1717 - 113 - - - diff --git a/nfc/manifest_nfc.xml b/nfc/manifest_nfc.xml deleted file mode 100644 index bf6b7cc..0000000 --- a/nfc/manifest_nfc.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - android.hardware.nfc - hwbinder - 1.2 - - INfc - default - - -