From 2ee51a5eddd5ee1d0506645da52e96ad7e2f5c4c Mon Sep 17 00:00:00 2001 From: Jan Altensen Date: Sun, 1 Sep 2019 17:44:21 +0200 Subject: [PATCH] universal8895: fixup files on extraction Change-Id: I4900c7d08882e647c1aceeef3ada8f5c2e89a41a --- extract-files.sh | 8 ++++++++ proprietary-files.txt | 6 +++--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/extract-files.sh b/extract-files.sh index aee8c5c..c7847f1 100755 --- a/extract-files.sh +++ b/extract-files.sh @@ -64,4 +64,12 @@ setup_vendor "${DEVICE_COMMON}" "${VENDOR}" "${LINEAGE_ROOT}" true "${CLEAN_VEND extract "$MY_DIR"/proprietary-files.txt "$SRC" +# Fix proprietary blobs +BLOB_ROOT="$LINEAGE_ROOT"/vendor/"$VENDOR"/"$DEVICE_COMMON"/proprietary + +sed -i "s/xliff=\"urn:oasis:names:tc:xliff:document:1.2\"/android=\"http:\/\/schemas.android.com\/apk\/res\/android\"/" $BLOB_ROOT/etc/nfcee_access.xml +sed -i -z "s/ seclabel u:r:gpsd:s0\n//" $BLOB_ROOT/vendor/etc/init/init.gps.rc +sed -i -z "s/-g@android:wpa_wlan0\n class main\n/-g@android:wpa_wlan0\n interface android.hardware.wifi.supplicant@1.0::ISupplicant default\n interface android.hardware.wifi.supplicant@1.1::ISupplicant default\n class main\n/" $BLOB_ROOT/vendor/etc/init/wifi.rc +sed -i -z "s/ setprop wifi.interface wlan0\n\n/ setprop wifi.interface wlan0\n setprop wifi.concurrent.interface swlan0\n\n/" $BLOB_ROOT/vendor/etc/init/wifi.rc + "${MY_DIR}/setup-makefiles.sh" diff --git a/proprietary-files.txt b/proprietary-files.txt index 379d9ab..db0a7cc 100644 --- a/proprietary-files.txt +++ b/proprietary-files.txt @@ -112,7 +112,7 @@ vendor/bin/hw/gpsd vendor/bin/hw/vendor.samsung.hardware.gnss@1.0-service vendor/etc/gnss/gps.cer vendor/etc/gnss/gps.xml -vendor/etc/init/init.gps.rc|b807905f49c6bb51a1d11b2d9adc9f84d2fb63e5 +vendor/etc/init/init.gps.rc vendor/etc/init/vendor.samsung.hardware.gnss@1.0-service.rc vendor/lib/libwrappergps.so vendor/lib64/hw/android.hardware.gnss@1.1-impl.so @@ -242,7 +242,7 @@ vendor/lib64/libMcClient.so # NFC etc/libnfc-nci.conf etc/nfc_key -etc/nfcee_access.xml|b59b3bb228f22e5997bdd64392287718792c331d +etc/nfcee_access.xml lib64/android.hardware.nfc@1.0.so lib64/android.hardware.nfc@1.1.so lib64/vendor.samsung.hardware.nfc@1.1.so @@ -341,7 +341,7 @@ vendor/lib/libstagefright_soft_g711dec.so # WiFi vendor/bin/hw/macloader vendor/bin/hw/mfgloader -vendor/etc/init/wifi.rc|194ef6e0e51f4b9a60d229b927724d06c83d30db +vendor/etc/init/wifi.rc vendor/etc/init/wifi_brcm.rc vendor/etc/wifi/bcmdhd_clm.blob vendor/etc/wifi/bcmdhd_mfg.bin_b0 -- 2.20.1