a52q: pull everything from A525FXXS7FXE2

Change-Id: I12ced06529057ae5808c056a5fbcb5d762678d1d

AndroidProducts.mk

@@ -14,9 +14,9 @@
 # limitations under the License.
 
 PRODUCT_MAKEFILES := \
-    $(LOCAL_DIR)/naap_a52q.mk
+    $(LOCAL_DIR)/lineage_a52q.mk
 
 COMMON_LUNCH_CHOICES := \
-    naap_a52q-userdebug \
-    naap_a52q-user \
-    naap_a52q-eng
+    lineage_a52q-ap1a-userdebug \
+    lineage_a52q-ap1a-user \
+    lineage_a52q-ap1a-eng

lineage_a52q.mk

@@ -44,8 +44,8 @@ PRODUCT_GMS_CLIENTID_BASE := android-samsung
 PRODUCT_SHIPPING_API_LEVEL := 30
 
 # Vendor fingerprint
-BUILD_FINGERPRINT := "samsung/a52qnsxx/a52q:11/RP1A.200720.012/A525FXXU6EWL3:user/release-keys"
-PRIVATE_BUILD_DESC := "a52qnsxx-user 11 RP1A.200720.012 A525FXXU6EWL3 release-keys"
+BUILD_FINGERPRINT := "samsung/a52qnsxx/a52q:11/RP1A.200720.012/A525FXXS7FXE2:user/release-keys"
+PRIVATE_BUILD_DESC := "a52qnsxx-user 11 RP1A.200720.012 A525FXXS7FXE2 release-keys"
 
 # Security patch
-VENDOR_SECURITY_PATCH := 2023-12-01
+VENDOR_SECURITY_PATCH := 2024-05-01

naap_a52q.mk

@@ -1,52 +0,0 @@
-#
-# Copyright (C) 2021 The LineageOS 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.
-#
-
-# Inherit device configuration
-$(call inherit-product, device/samsung/a52q/device.mk)
-
-# Inherit from the 64 bit configuration
-$(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk)
-
-# Inherit from the common Open Source product configuration
-$(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_base_telephony.mk)
-
-# Inherit some common Lineage stuff
-$(call inherit-product, vendor/naap/config/common_full_phone.mk)
-
-# Enable updating of APEXes
-$(call inherit-product, $(SRC_TARGET_DIR)/product/updatable_apex.mk)
-
-# Boot animation
-TARGET_SCREEN_HEIGHT := 2400
-TARGET_SCREEN_WIDTH := 1080
-TARGET_BOOT_ANIMATION_RES := 1080
-
-## Device identifier. This must come after all inclusions
-PRODUCT_NAME := naap_a52q
-PRODUCT_DEVICE := a52q
-PRODUCT_BRAND := samsung
-PRODUCT_MODEL := SM-A525F
-PRODUCT_MANUFACTURER := samsung
-PRODUCT_GMS_CLIENTID_BASE := android-samsung
-
-# Recovery
-TARGET_USES_AOSP_RECOVERY := true
-
-PRODUCT_SHIPPING_API_LEVEL := 30
-
-# Vendor fingerprint
-BUILD_FINGERPRINT := "samsung/a52qnsxx/a52q:11/RP1A.200720.012/A525FXXU6DWH2:user/release-keys"
-PRIVATE_BUILD_DESC := "a52qnsxx-user 11 RP1A.200720.012 A525FXXU6DWH2 release-keys"

proprietary-files.txt

@@ -1,4 +1,4 @@
-# All blobs are from A525FXXU6EWL3 (U), unless pinned
+# All blobs are from A525FXXS7FXE2 (U), unless pinned
 
 # ACDB
 vendor/etc/audconf/ODM/Global_cal.acdb