g12-common: Include device specific rc

[GitHub/LineageOS/G12/android_device_amlogic_g12-common.git] / extract-files.sh

diff --git a/extract-files.sh b/extract-files.sh
index c53e26c0857e445d73e4c34a8e26ae2d1f4a0d1e..72a3c2db99e6e64091b372dd90a4453c977222af 100755 (executable)
--- a/extract-files.sh
+++ b/extract-files.sh
@@ -60,22 +60,9 @@ fi
 
 function blob_fixup() {
      case "${1}" in
-         vendor/lib/libmeson_display_adapter_remote.so)
-             "${PATCHELF}" --remove-needed "libhidltransport.so" "${2}"
-             "${PATCHELF}" --remove-needed "libhwbinder.so" "${2}"
-             ;;
-         vendor/lib/libmeson_display_service.so)
-             "${PATCHELF}" --remove-needed "libhidltransport.so" "${2}"
-             "${PATCHELF}" --remove-needed "libhwbinder.so" "${2}"
-             ;;
-        vendor/lib/hw/android.hardware.graphics.mapper@3.0-impl-arm.so)
-             "${PATCHELF}" --remove-needed "libhidltransport.so" "${2}"
-             ;;
-        vendor/lib/hw/android.hardware.graphics.allocator@3.0-impl-arm.so)
-             "${PATCHELF}" --remove-needed "libhidltransport.so" "${2}"
-             ;;
-        vendor/bin/hw/android.hardware.graphics.allocator@3.0-service)
-             "${PATCHELF}" --remove-needed "libhidltransport.so" "${2}"
+        vendor/etc/init/fs.rc)
+             sed -i '/media 0770 media_rw media_rw/d' "${2}"
+             sed -i '/setprop ro.crypto.fuse_sdcard true/d' "${2}"
              ;;
         vendor/etc/init/tee-supplicant.rc)
              sed -i s#/vendor/lib/#/vendor/lib/modules/#g "${2}"
@@ -85,18 +72,19 @@ function blob_fixup() {
 
 if [ -z "${ONLY_TARGET}" ]; then
     # Initialize the helper for common device
-    setup_vendor "${DEVICE_COMMON}" "${VENDOR_COMMON}" "${ANDROID_ROOT}" true "${CLEAN_VENDOR}"
+    setup_vendor "${DEVICE_COMMON}" "${VENDOR_COMMON:-$VENDOR}" "${ANDROID_ROOT}" true "${CLEAN_VENDOR}"
 
     extract "${MY_DIR}/proprietary-files.txt" "${SRC}" "${KANG}" --section "${SECTION}"
+    extract "${MY_DIR}/proprietary-files-atv.txt" "${SRC}" "${KANG}" --section "${SECTION}"
     extract "${MY_DIR}/proprietary-files-tee.txt" "${SRC}" "${KANG}" --section "${SECTION}"
 fi
 
-if [ -z "${ONLY_COMMON}" ] && [ -s "${MY_DIR}/../../${VENDOR_DEVICE}/${DEVICE}/proprietary-files.txt" ]; then
+if [ -z "${ONLY_COMMON}" ] && [ -s "${MY_DIR}/../../${VENDOR}/${DEVICE}/proprietary-files.txt" ]; then
     # Reinitialize the helper for device
-    source "${MY_DIR}/../../${VENDOR_DEVICE}/${DEVICE}/extract-files.sh"
-    setup_vendor "${DEVICE}" "${VENDOR_DEVICE}" "${ANDROID_ROOT}" false "${CLEAN_VENDOR}"
+    source "${MY_DIR}/../../${VENDOR}/${DEVICE}/extract-files.sh"
+    setup_vendor "${DEVICE}" "${VENDOR}" "${ANDROID_ROOT}" false "${CLEAN_VENDOR}"
 
-    extract "${MY_DIR}/../../${VENDOR_DEVICE}/${DEVICE}/proprietary-files.txt" "${SRC}" "${KANG}" --section "${SECTION}"
+    extract "${MY_DIR}/../../${VENDOR}/${DEVICE}/proprietary-files.txt" "${SRC}" "${KANG}" --section "${SECTION}"
 fi
 
 "${MY_DIR}/setup-makefiles.sh"