crDroid A14 Qpr2 rebase

- Sync with td source android_14.0.0_r37 ci-20240508

Signed-off-by: naz664 <[email protected]>

patches/personal/platform_build_make/01-Remove-duplicated-adb-secure.patch

@@ -1,17 +1,17 @@
-From 1e0e164074db630f6988196499f7a57424dd3b02 Mon Sep 17 00:00:00 2001
+From ff320c8541dce1126cfd1160c180991c30bba676 Mon Sep 17 00:00:00 2001
 From: naz664 <[email protected]>
 Date: Fri, 11 Nov 2022 15:50:46 +0000
-Subject: [PATCH] Remove duplicated adb-secure
+Subject: [PATCH 1/3] Remove duplicated adb-secure
 
 ---
  core/main.mk | 6 +-----
  1 file changed, 1 insertion(+), 5 deletions(-)
 
 diff --git a/core/main.mk b/core/main.mk
-index 66b92d88d..aa77be9c1 100644
+index 040a1a5..8a7db0a 100644
 --- a/core/main.mk
 +++ b/core/main.mk
-@@ -368,10 +368,6 @@ ifneq (,$(user_variant))
+@@ -396,10 +396,6 @@ ifneq (,$(user_variant))
    ADDITIONAL_SYSTEM_PROPERTIES += ro.secure=1
    ADDITIONAL_SYSTEM_PROPERTIES += security.perf_harden=1
 
@@ -22,7 +22,7 @@ index 66b92d88d..aa77be9c1 100644
    ifeq ($(user_variant),userdebug)
      # Pick up some extra useful tools
      tags_to_install += debug
-@@ -397,7 +393,7 @@ ifeq (true,$(strip $(enable_target_debugging)))
+@@ -425,7 +421,7 @@ ifeq (true,$(strip $(enable_target_debugging)))
    ADDITIONAL_SYSTEM_PROPERTIES += ro.debuggable=1
  else # !enable_target_debugging
    # Target is less debuggable and adbd is off by default
@@ -32,5 +32,5 @@ index 66b92d88d..aa77be9c1 100644
 
  ## eng ##
 -- 
-2.25.1
+2.34.1
 

patches/personal/platform_build_make/02-Dont-handle-apns.patch → patches/personal/platform_build_make/02-Dont-handle-apns.patch.patch

@@ -1,29 +1,30 @@
-From d9bbada9d2b635ac3e52b858cfce212ea11f26f9 Mon Sep 17 00:00:00 2001
+From 6d45095a8dc661f30ea5133f9f1b7ad44e1cc05b Mon Sep 17 00:00:00 2001
 From: naz664 <[email protected]>
 Date: Sat, 3 Sep 2022 14:50:43 +0000
-Subject: [PATCH] Dont-handle-apns.patch
+Subject: [PATCH 2/3] Dont-handle-apns.patch
 
 ---
- target/product/aosp_product.mk        | 6 ------
+ target/product/aosp_product.mk        | 7 -------
  target/product/full_base_telephony.mk | 5 -----
- 2 files changed, 11 deletions(-)
+ 2 files changed, 12 deletions(-)
 
 diff --git a/target/product/aosp_product.mk b/target/product/aosp_product.mk
-index b41c35fb7..0abf38329 100644
+index 67ab7a7..5dae7db 100644
 --- a/target/product/aosp_product.mk
 +++ b/target/product/aosp_product.mk
-@@ -38,9 +38,3 @@ PRODUCT_PACKAGES += \
+@@ -36,10 +36,3 @@ PRODUCT_PACKAGES += \
+     PhotoTable \
      preinstalled-packages-platform-aosp-product.xml \
-     WallpaperPicker \
- 
+     ThemePicker \
+-
 -# Telephony:
 -#   Provide a APN configuration to GSI product
 -ifeq ($(LINEAGE_BUILD),)
 -PRODUCT_COPY_FILES += \
 -    device/sample/etc/apns-full-conf.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/apns-conf.xml
 -endif
 diff --git a/target/product/full_base_telephony.mk b/target/product/full_base_telephony.mk
-index e4f5a162b..5470ad2be 100644
+index e4f5a16..5470ad2 100644
 --- a/target/product/full_base_telephony.mk
 +++ b/target/product/full_base_telephony.mk
 @@ -26,10 +26,5 @@ PRODUCT_VENDOR_PROPERTIES := \
@@ -38,5 +39,5 @@ index e4f5a162b..5470ad2be 100644
  $(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_base.mk)
  $(call inherit-product, $(SRC_TARGET_DIR)/product/telephony.mk)
 -- 
-2.25.1
+2.34.1
 

patches/personal/platform_build_make/03-remove-su-from-no-su-builds.patch

@@ -1,17 +1,17 @@
-From 5287b85169971c032ff8b3689358546375e0190c Mon Sep 17 00:00:00 2001
+From 3865d51c203ffd3138a33b7ecdd34e16a9d50d0e Mon Sep 17 00:00:00 2001
 From: naz664 <[email protected]>
 Date: Mon, 26 Dec 2022 11:54:04 +0000
-Subject: [PATCH] remove su from no-su builds
+Subject: [PATCH 3/3] remove su from no-su builds
 
 ---
  target/product/base_system.mk | 8 ++++----
  1 file changed, 4 insertions(+), 4 deletions(-)
 
 diff --git a/target/product/base_system.mk b/target/product/base_system.mk
-index add010cff..15724e886 100644
+index 75e2703..eb00bae 100644
 --- a/target/product/base_system.mk
 +++ b/target/product/base_system.mk
-@@ -396,10 +396,10 @@ PRODUCT_PACKAGES_DEBUG := \
+@@ -444,10 +444,10 @@ PRODUCT_PACKAGES_DEBUG := \
      unwind_reg_info \
      unwind_symbols \
 
@@ -27,5 +27,5 @@ index add010cff..15724e886 100644
  # The set of packages whose code can be loaded by the system server.
  PRODUCT_SYSTEM_SERVER_APPS += \
 -- 
-2.25.1
+2.34.1
 

patches/personal/platform_vendor_lineage/01-Disable-generated-kernel-headers.patch → patches/personal/platform_vendor_lineage/01-Disable-generated-kernel-headers.patch.patch

@@ -1,22 +1,22 @@
-From b27ca393521d10da6303b9f95bbd4666eb9cc8d6 Mon Sep 17 00:00:00 2001
+From 409f248f1b86699f25d7d513fdf6e2f0ffe7e76a Mon Sep 17 00:00:00 2001
 From: naz664 <[email protected]>
 Date: Sat, 3 Sep 2022 14:59:05 +0000
-Subject: [PATCH 1/2] Disable-generated-kernel-headers.patch
+Subject: [PATCH] Disable-generated-kernel-headers.patch
 
 ---
  build/soong/Android.bp | 12 ------------
  1 file changed, 12 deletions(-)
 
 diff --git a/build/soong/Android.bp b/build/soong/Android.bp
-index 15c5fcce..fbe4ed66 100644
+index d0e9d9e..025f632 100644
 --- a/build/soong/Android.bp
 +++ b/build/soong/Android.bp
 @@ -20,9 +20,6 @@ bootstrap_go_package {
  lineage_generator {
      name: "generated_kernel_includes",
 
 -    // The headers make command
--    cmd: "$(PATH_OVERRIDE_SOONG) $(KERNEL_MAKE_CMD) $(KERNEL_MAKE_FLAGS) -C $(TARGET_KERNEL_SOURCE) O=$(KERNEL_BUILD_OUT_PREFIX)$(genDir) ARCH=$(KERNEL_ARCH) $(KERNEL_CROSS_COMPILE) headers_install",
+-    cmd: "$(PATH_OVERRIDE_SOONG) $(KERNEL_MAKE_CMD) $(KERNEL_MAKE_FLAGS) -C $(TARGET_KERNEL_SOURCE) O=$(KERNEL_BUILD_OUT_PREFIX)$(genDir) ARCH=$(KERNEL_ARCH) $(KERNEL_CROSS_COMPILE) headers_install && vendor/lineage/tools/clean_headers.sh $(KERNEL_BUILD_OUT_PREFIX)$(genDir)",
 -
      // Directories that can be imported by a cc_* module generated_headers property
      export_include_dirs: [
@@ -36,7 +36,7 @@ index 15c5fcce..fbe4ed66 100644
 -    ],
  }
 
- cc_library_headers {
+ cc_defaults {
 -- 
-2.25.1
+2.34.1
 

patches/personal/platform_vendor_lineage/03-Nuke-recorder-AudioFx-Add-gapps-path.patch

@@ -0,0 +1,51 @@
+From 8779cb51b72cc584c4b40b295e8b798219ff7825 Mon Sep 17 00:00:00 2001
+From: naz664 <[email protected]>
+Date: Wed, 15 May 2024 12:45:16 +0000
+Subject: [PATCH] Nuke recorder,AudioFx & Add gapps path
+
+Signed-off-by: naz664 <[email protected]>
+---
+ config/common_full.mk | 6 ------
+ config/version.mk     | 5 +++++
+ 2 files changed, 5 insertions(+), 6 deletions(-)
+
+diff --git a/config/common_full.mk b/config/common_full.mk
+index e30f05d..1d159aa 100644
+--- a/config/common_full.mk
++++ b/config/common_full.mk
+@@ -8,7 +8,6 @@ PRODUCT_PACKAGES += \
+     Eleven \
+     Etar \
+     Profiles \
+-    Recorder \
+     Seedvault
+
+ ifneq ($(PRODUCT_NO_CAMERA),true)
+@@ -16,11 +15,6 @@ PRODUCT_PACKAGES += \
+     Aperture
+ endif
+
+-ifneq ($(TARGET_EXCLUDES_AUDIOFX),true)
+-PRODUCT_PACKAGES += \
+-    AudioFX
+-endif
+-
+ # Extra cmdline tools
+ PRODUCT_PACKAGES += \
+     unrar \
+diff --git a/config/version.mk b/config/version.mk
+index 5f07efb..aaf2524 100644
+--- a/config/version.mk
++++ b/config/version.mk
+@@ -9,3 +9,8 @@ LINEAGE_VERSION := crDroidAndroid-$(PRODUCT_VERSION_MAJOR).$(PRODUCT_VERSION_MIN
+
+ # Display version
+ LINEAGE_DISPLAY_VERSION := crDroidAndroid-$(PRODUCT_VERSION_MAJOR).$(PRODUCT_VERSION_MINOR)-$(LINEAGE_BUILD)-v$(CR_VERSION)
++
++ifeq ($(WITH_GAPPS), true)
++    $(call inherit-product, vendor/gapps/arm64/arm64-vendor.mk)
++    LINEAGE_BUILD_ZIP_TYPE := GAPPS
++endif
+-- 
+2.34.1
+

patches/trebledroid/platform_bionic/0001-Disable-vndklite-handling.patch

@@ -1,4 +1,4 @@
-From da3e4e28f1087493239cd8991e5cfa2ff576e22f Mon Sep 17 00:00:00 2001
+From b354689bc72bb0ab0da52cc11ec5930444606d2c Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <[email protected]>
 Date: Wed, 27 Oct 2021 14:39:29 -0400
 Subject: [PATCH 1/2] Disable vndklite handling
@@ -9,18 +9,18 @@ Change-Id: Ic4474cf80fc4b45a9a2760dd51e2ca29c4d961e2
  1 file changed, 5 deletions(-)
 
 diff --git a/linker/linker.cpp b/linker/linker.cpp
-index 17b574fc1f..c863f8ea69 100644
+index 135eaa380..93523dcc0 100644
 --- a/linker/linker.cpp
 +++ b/linker/linker.cpp
-@@ -95,7 +95,6 @@ static uint64_t g_module_unload_counter = 0;
+@@ -97,7 +97,6 @@ static uint64_t g_module_unload_counter = 0;
  static const char* const kLdConfigArchFilePath = "/system/etc/ld.config." ABI_STRING ".txt";
 
  static const char* const kLdConfigFilePath = "/system/etc/ld.config.txt";
 -static const char* const kLdConfigVndkLiteFilePath = "/system/etc/ld.config.vndk_lite.txt";
 
  static const char* const kLdGeneratedConfigFilePath = "/linkerconfig/ld.config.txt";
 
-@@ -3423,10 +3422,6 @@ static std::string get_ld_config_file_apex_path(const char* executable_path) {
+@@ -3444,10 +3443,6 @@ static std::string get_ld_config_file_apex_path(const char* executable_path) {
  }
 
  static std::string get_ld_config_file_vndk_path() {
@@ -32,5 +32,5 @@ index 17b574fc1f..c863f8ea69 100644
    size_t insert_pos = ld_config_file_vndk.find_last_of('.');
    if (insert_pos == std::string::npos) {
 -- 
-2.34.1
+2.25.1
 

patches/trebledroid/platform_bionic/0002-Add-new-mechanism-to-fake-vendor-props-on-a-per-proc.patch

@@ -1,4 +1,4 @@
-From 79369fc64d5ccad0b668c270b25276ec5a4b7d2d Mon Sep 17 00:00:00 2001
+From 0cbe25143ccc28bd13d85cd2c01cbb9ac6cf9be4 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <[email protected]>
 Date: Sat, 19 Feb 2022 08:20:25 -0500
 Subject: [PATCH 2/2] Add new mechanism to fake vendor props on a per-process
@@ -11,10 +11,10 @@ then ro.product.device/ro.product.manufacturer is read from vendor
  1 file changed, 85 insertions(+), 2 deletions(-)
 
 diff --git a/libc/system_properties/system_properties.cpp b/libc/system_properties/system_properties.cpp
-index 1cb15c3df5..0571993189 100644
+index 9dd5e35ce..886bef127 100644
 --- a/libc/system_properties/system_properties.cpp
 +++ b/libc/system_properties/system_properties.cpp
-@@ -35,6 +35,8 @@
+@@ -36,6 +36,8 @@
  #include <sys/stat.h>
  #include <sys/types.h>
  #include <unistd.h>
@@ -23,9 +23,9 @@ index 1cb15c3df5..0571993189 100644
 
  #include <new>
 
-@@ -50,6 +52,85 @@
- #define SERIAL_DIRTY(serial) ((serial)&1)
+@@ -53,6 +55,85 @@
  #define SERIAL_VALUE_LEN(serial) ((serial) >> 24)
+ #define APPCOMPAT_PREFIX "ro.appcompat_override."
 
 +static char comm[128];
 +static bool self_ok = false;
@@ -109,7 +109,7 @@ index 1cb15c3df5..0571993189 100644
  static bool is_dir(const char* pathname) {
    struct stat info;
    if (stat(pathname, &info) == -1) {
-@@ -123,17 +204,19 @@ uint32_t SystemProperties::AreaSerial() {
+@@ -156,17 +237,19 @@ uint32_t SystemProperties::AreaSerial() {
  }
 
  const prop_info* SystemProperties::Find(const char* name) {
@@ -130,7 +130,7 @@ index 1cb15c3df5..0571993189 100644
 +  return pa->find(newName);
  }
 
- static bool is_read_only(const char* name) {
+ static bool is_appcompat_override(const char* name) {
 -- 
-2.34.1
+2.25.1
 

patches/trebledroid/platform_bootable_recovery/0001-Don-t-reboot-if-we-couldn-t-get-bootctrl.patch

@@ -1,4 +1,4 @@
-From 9805c3d5fd0f23b9d914ef66243d65d9c7a99e4d Mon Sep 17 00:00:00 2001
+From fe82aa41e542f4da2709976cda0713dfa089cc1d Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <[email protected]>
 Date: Thu, 12 Sep 2019 20:31:07 +0200
 Subject: [PATCH] Don't reboot if we couldn't get bootctrl
@@ -9,7 +9,7 @@ Change-Id: Id1793660bd1c97ab369607f58a772ca3512ec1af
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/update_verifier/update_verifier.cpp b/update_verifier/update_verifier.cpp
-index a0160e2fc..24d6ccab2 100644
+index a0160e2f..24d6ccab 100644
 --- a/update_verifier/update_verifier.cpp
 +++ b/update_verifier/update_verifier.cpp
 @@ -324,7 +324,7 @@ int update_verifier(int argc, char** argv) {
@@ -22,5 +22,5 @@ index a0160e2fc..24d6ccab2 100644
 
    uint32_t current_slot = module->GetCurrentSlot();
 -- 
-2.34.1
+2.25.1
 

patches/trebledroid/platform_build/0003-Remove-init.vndk-nodef.rc.patch → patches/trebledroid/platform_build/0001-Remove-init.vndk-nodef.rc.patch

@@ -1,7 +1,7 @@
-From 565248347f94ede02f0c4c33444e9d73926dc754 Mon Sep 17 00:00:00 2001
+From 2c761f1b349683e9393c41f2d170aa4090f09c88 Mon Sep 17 00:00:00 2001
 From: Andy CrossGate Yan <[email protected]>
 Date: Wed, 8 Dec 2021 07:04:53 +0000
-Subject: [PATCH 3/6] Remove init.vndk-nodef.rc
+Subject: [PATCH 1/4] Remove init.vndk-nodef.rc
 
 This partially reverts "Deprecate VNDK-lite support from Legacy GSI".
 
@@ -19,10 +19,10 @@ Change-Id: I7c14fe5229e953f620bb225fa5c981752d0ac5f9
  delete mode 100644 target/product/gsi/init.vndk-nodef.rc
 
 diff --git a/target/product/gsi/Android.mk b/target/product/gsi/Android.mk
-index 107c94f6859..0ad39c36101 100644
+index 007aabd3cd..aca3570fcd 100644
 --- a/target/product/gsi/Android.mk
 +++ b/target/product/gsi/Android.mk
-@@ -256,16 +256,3 @@ LOCAL_SYSTEM_EXT_MODULE := true
+@@ -249,16 +249,3 @@ LOCAL_SYSTEM_EXT_MODULE := true
  LOCAL_MODULE_RELATIVE_PATH := init
 
  include $(BUILD_PREBUILT)
@@ -40,7 +40,7 @@ index 107c94f6859..0ad39c36101 100644
 -
 -include $(BUILD_PREBUILT)
 diff --git a/target/product/gsi/init.gsi.rc b/target/product/gsi/init.gsi.rc
-index 69c8e467be0..c6faba78d99 100644
+index 69c8e467be..c6faba78d9 100644
 --- a/target/product/gsi/init.gsi.rc
 +++ b/target/product/gsi/init.gsi.rc
 @@ -1,5 +1,3 @@
@@ -51,18 +51,18 @@ index 69c8e467be0..c6faba78d99 100644
 -import /system/system_ext/etc/gsi/init.vndk-${ro.vndk.version:-nodef}.rc
 diff --git a/target/product/gsi/init.vndk-nodef.rc b/target/product/gsi/init.vndk-nodef.rc
 deleted file mode 100644
-index 1b141a05e70..00000000000
+index 1b141a05e7..0000000000
 --- a/target/product/gsi/init.vndk-nodef.rc
 +++ /dev/null
 @@ -1,3 +0,0 @@
 -on early-init
 -    # Reboot if BOARD_VNDK_VERSION is not defined
 -    exec - root -- /system/bin/reboot bootloader
 diff --git a/target/product/gsi_release.mk b/target/product/gsi_release.mk
-index 9d102ea515d..ec42b2ce775 100644
+index c94940cfbd..3699a06043 100644
 --- a/target/product/gsi_release.mk
 +++ b/target/product/gsi_release.mk
-@@ -62,7 +62,6 @@ PRODUCT_PACKAGES += com.android.apex.cts.shim.v1_with_prebuilts.flattened
+@@ -51,7 +51,6 @@ PRODUCT_SET_DEBUGFS_RESTRICTIONS := false
  PRODUCT_PACKAGES += \
      gsi_skip_mount.cfg \
      init.gsi.rc \
@@ -71,5 +71,5 @@ index 9d102ea515d..ec42b2ce775 100644
  # Overlay the GSI specific SystemUI setting
  PRODUCT_PACKAGES += gsi_overlay_systemui
 -- 
-2.34.1
+2.25.1