zenfone9: Drop some prebuilt files and add rfs/mdm/wpss symlink
Change-Id: I001eefd342e4b83c064e43a51cf14b7714a0f913
diff --git a/Android.mk b/Android.mk
index d26cf21..f0e75b8 100755
--- a/Android.mk
+++ b/Android.mk
@@ -140,6 +140,18 @@
$(hide) ln -sf /vendor/firmware_mnt $@/readonly/firmware
$(hide) ln -sf /vendor/firmware $@/readonly/vendor/firmware
+RFS_MSM_WPSS_SYMLINKS := $(TARGET_OUT_VENDOR)/rfs/msm/wpss/
+$(RFS_MSM_WPSS_SYMLINKS): $(LOCAL_INSTALLED_MODULE)
+ @echo "Creating RFS MSM WPSS folder structure: $@"
+ @rm -rf $@/*
+ @mkdir -p $(dir $@)/readonly/vendor
+ $(hide) ln -sf /data/vendor/tombstones/rfs/wpss $@/ramdumps
+ $(hide) ln -sf /mnt/vendor/persist/rfs/msm/wpss $@/readwrite
+ $(hide) ln -sf /mnt/vendor/persist/rfs/shared $@/shared
+ $(hide) ln -sf /mnt/vendor/persist/hlos_rfs/shared $@/hlos
+ $(hide) ln -sf /vendor/firmware_mnt $@/readonly/firmware
+ $(hide) ln -sf /vendor/firmware $@/readonly/vendor/firmware
+
WIFI_FIRMWARE_SYMLINKS := $(TARGET_OUT_VENDOR)/firmware/wlan/qca_cld
$(WIFI_FIRMWARE_SYMLINKS): $(LOCAL_INSTALLED_MODULE)
@echo "Creating WiFi firmware symlinks: $@"
@@ -152,6 +164,7 @@
$(RFS_MSM_CDSP_SYMLINKS) \
$(RFS_MSM_MPSS_SYMLINKS) \
$(RFS_MSM_SLPI_SYMLINKS) \
+ $(RFS_MSM_WPSS_SYMLINKS) \
$(WIFI_FIRMWARE_SYMLINKS)
endif
diff --git a/proprietary-files-vendor.txt b/proprietary-files-vendor.txt
index dff7c94..a4d1407 100644
--- a/proprietary-files-vendor.txt
+++ b/proprietary-files-vendor.txt
@@ -1749,9 +1749,6 @@
vendor/lib/android.hardware.nfc@1.0.so
vendor/lib/android.hardware.nfc@1.1.so
vendor/lib/android.hardware.nfc@1.2.so
-vendor/lib/android.hardware.power@1.0.so
-vendor/lib/android.hardware.power@1.1.so
-vendor/lib/android.hardware.power@1.2.so
vendor/lib/android.hardware.radio.config@1.0.so
vendor/lib/android.hardware.radio.config@1.1.so
vendor/lib/android.hardware.radio.config@1.2.so
@@ -1979,7 +1976,6 @@
vendor/lib/hw/com.qti.chi.override.so
vendor/lib/hw/gralloc.default.so
vendor/lib/hw/local_time.default.so
-vendor/lib/hw/power.default.so
vendor/lib/hw/sound_trigger.primary.taro.so
vendor/lib/hw/vendor.qti.esepowermanager@1.1-impl.so
vendor/lib/hw/vendor.qti.hardware.alarm@1.0-impl.so
@@ -2877,10 +2873,6 @@
vendor/lib64/android.hardware.nfc@1.0.so
vendor/lib64/android.hardware.nfc@1.1.so
vendor/lib64/android.hardware.nfc@1.2.so
-vendor/lib64/android.hardware.power-V1-ndk_platform.so
-vendor/lib64/android.hardware.power@1.0.so
-vendor/lib64/android.hardware.power@1.1.so
-vendor/lib64/android.hardware.power@1.2.so
vendor/lib64/android.hardware.radio.config@1.0.so
vendor/lib64/android.hardware.radio.config@1.1.so
vendor/lib64/android.hardware.radio.config@1.2.so
@@ -3142,7 +3134,6 @@
vendor/lib64/hw/fingerprint.default.so
vendor/lib64/hw/gralloc.default.so
vendor/lib64/hw/local_time.default.so
-vendor/lib64/hw/power.default.so
vendor/lib64/hw/sound_trigger.primary.taro.so
vendor/lib64/hw/vendor.qti.esepowermanager@1.1-impl.so
vendor/lib64/hw/vendor.qti.hardware.alarm@1.0-impl.so
@@ -4000,19 +3991,3 @@
vendor/lib64/vendor.qti.spu@1.1.so
vendor/lib64/vendor.qti.spu@2.0.so
vendor/lib64/vendor.qti.voiceprint@1.0.so
-vendor/rfs/mdm/cdsp/readonly/vendor/firmware
-vendor/rfs/mdm/slpi/readonly/vendor/firmware
-vendor/rfs/mdm/tn/readonly/vendor/firmware
-vendor/rfs/mdm/wpss/hlos
-vendor/rfs/mdm/wpss/ramdumps
-vendor/rfs/mdm/wpss/readonly/firmware
-vendor/rfs/mdm/wpss/readonly/vendor/firmware
-vendor/rfs/mdm/wpss/readwrite
-vendor/rfs/mdm/wpss/shared
-vendor/rfs/msm/wpss/hlos
-vendor/rfs/msm/wpss/ramdumps
-vendor/rfs/msm/wpss/readonly/firmware
-vendor/rfs/msm/wpss/readonly/vendor/firmware
-vendor/rfs/msm/wpss/readwrite
-vendor/rfs/msm/wpss/shared
-vendor/rfs/rfs_symlinks
diff --git a/regen-vendor.sh b/regen-vendor.sh
index 91a09ec..d342adc 100755
--- a/regen-vendor.sh
+++ b/regen-vendor.sh
@@ -653,6 +653,15 @@
"bin/hw/android.hardware.power-service"
"etc/init/android.hardware.power-service.rc"
"etc/vintf/manifest/power.xml"
+ "lib/android.hardware.power@1.0.so"
+ "lib/android.hardware.power@1.1.so"
+ "lib/android.hardware.power@1.2.so"
+ "lib/hw/power.default.so"
+ "lib64/hw/power.default.so"
+ "lib64/android.hardware.power-V1-ndk_platform.so"
+ "lib64/android.hardware.power@1.0.so"
+ "lib64/android.hardware.power@1.1.so"
+ "lib64/android.hardware.power@1.2.so"
# Rfs
"rfs/apq/gnss/hlos"
@@ -712,6 +721,22 @@
"rfs/msm/slpi/readonly/vendor/firmware"
"rfs/msm/slpi/readwrite"
"rfs/msm/slpi/shared"
+ "rfs/mdm/cdsp/readonly/vendor/firmware"
+ "rfs/mdm/slpi/readonly/vendor/firmware"
+ "rfs/mdm/tn/readonly/vendor/firmware"
+ "rfs/mdm/wpss/hlos"
+ "rfs/mdm/wpss/ramdumps"
+ "rfs/mdm/wpss/readonly/firmware"
+ "rfs/mdm/wpss/readonly/vendor/firmware"
+ "rfs/mdm/wpss/readwrite"
+ "rfs/mdm/wpss/shared"
+ "rfs/msm/wpss/hlos"
+ "rfs/msm/wpss/ramdumps"
+ "rfs/msm/wpss/readonly/firmware"
+ "rfs/msm/wpss/readonly/vendor/firmware"
+ "rfs/msm/wpss/readwrite"
+ "rfs/msm/wpss/shared"
+ "rfs/rfs_symlinks"
# Sepolicy
"etc/selinux/vendor_file_contexts"