Fix camera on taimen/walleye/alioth

+ typo fix for last commit
+ cherrypick cleanups

Signed-off-by: Tad <tad@spotco.us>
This commit is contained in:
Tad 2021-08-09 23:39:16 -04:00
parent 0b4ad0e7cc
commit 3a79316ddb
6 changed files with 8 additions and 15 deletions

View File

@ -241,7 +241,7 @@ echo "Deblobbing...";
makes=$makes"|android.hardware.telephony.euicc.*"; makes=$makes"|android.hardware.telephony.euicc.*";
#Google Camera #Google Camera
#blobs=$blobs"|com.google.android.camera.*"; #XXX: breaks cameara on Pixel 2? #blobs=$blobs"|com.google.android.camera.*";
#Google Setup Wizard #Google Setup Wizard
blobs=$blobs"|DreamlinerPrebuilt.apk|DreamlinerUpdater.apk"; blobs=$blobs"|DreamlinerPrebuilt.apk|DreamlinerUpdater.apk";
@ -270,8 +270,7 @@ echo "Deblobbing...";
blobs=$blobs"|hdcp1.*|hdcp2.*|tzhdcp.*"; blobs=$blobs"|hdcp1.*|hdcp2.*|tzhdcp.*";
#HDR #HDR
blobs=$blobs"|libhdr.*.so"; blobs=$blobs"|libdovi.so|libhdr_tm.so";
blobs=$blobs"|libdovi.so";
blobs=$blobs"|DolbyVisionService.apk"; blobs=$blobs"|DolbyVisionService.apk";
blobs=$blobs"|dolby_vision.cfg|hdr_tm_config.xml"; blobs=$blobs"|dolby_vision.cfg|hdr_tm_config.xml";
@ -424,7 +423,7 @@ echo "Deblobbing...";
#Pixel Visual Core [Google] #Pixel Visual Core [Google]
#blobs=$blobs"|easelmanagerd"; #blobs=$blobs"|easelmanagerd";
#blobs=$blobs"|EaselServicePrebuilt.apk"; #blobs=$blobs"|EaselServicePrebuilt.apk";
#blobs=$blobs"|libeaselcomm.so|libeaselcontrol.amber.so"; #blobs=$blobs"|libeaselcomm.so|libeaselcontrol.amber.so|libhdrplusclient.so|libhdrplusclientimpl.so|libhdrplusmessenger.so";
#Playready (DRM) [Microsoft] #Playready (DRM) [Microsoft]
blobs=$blobs"|prapp|scranton_RD"; blobs=$blobs"|prapp|scranton_RD";

View File

@ -85,8 +85,7 @@ patchWorkspace() {
umask 0022; umask 0022;
if [ "$DOS_MALWARE_SCAN_ENABLED" = true ]; then scanForMalware false "$DOS_PREBUILT_APPS $DOS_BUILD_BASE/build $DOS_BUILD_BASE/device $DOS_BUILD_BASE/vendor/lineage"; fi; if [ "$DOS_MALWARE_SCAN_ENABLED" = true ]; then scanForMalware false "$DOS_PREBUILT_APPS $DOS_BUILD_BASE/build $DOS_BUILD_BASE/device $DOS_BUILD_BASE/vendor/lineage"; fi;
source build/envsetup.sh; #source build/envsetup.sh;
repopick -it O_asb_2021-08;
source "$DOS_SCRIPTS/Patch.sh"; source "$DOS_SCRIPTS/Patch.sh";
source "$DOS_SCRIPTS_COMMON/Copy_Keys.sh"; source "$DOS_SCRIPTS_COMMON/Copy_Keys.sh";

View File

@ -73,9 +73,8 @@ patchWorkspace() {
umask 0022; umask 0022;
if [ "$DOS_MALWARE_SCAN_ENABLED" = true ]; then scanForMalware false "$DOS_PREBUILT_APPS $DOS_BUILD_BASE/build $DOS_BUILD_BASE/device $DOS_BUILD_BASE/vendor/lineage"; fi; if [ "$DOS_MALWARE_SCAN_ENABLED" = true ]; then scanForMalware false "$DOS_PREBUILT_APPS $DOS_BUILD_BASE/build $DOS_BUILD_BASE/device $DOS_BUILD_BASE/vendor/lineage"; fi;
source build/envsetup.sh; #source build/envsetup.sh;
#repopick -it pie-firewall; #repopick -it pie-firewall;
repopick -it P_asb_2021-08;
source "$DOS_SCRIPTS/Patch.sh"; source "$DOS_SCRIPTS/Patch.sh";
source "$DOS_SCRIPTS_COMMON/Copy_Keys.sh"; source "$DOS_SCRIPTS_COMMON/Copy_Keys.sh";

View File

@ -237,10 +237,6 @@ if enterAndClear "system/extras"; then
patch -p1 < "$DOS_PATCHES/android_system_extras/0001-ext4_pad_filenames.patch"; #FBE: pad filenames more (GrapheneOS) patch -p1 < "$DOS_PATCHES/android_system_extras/0001-ext4_pad_filenames.patch"; #FBE: pad filenames more (GrapheneOS)
fi; fi;
if enterAndClear "system/libhwbinder"; then
git pull "https://github.com/LineageOS/android_system_libhwbinder" refs/changes/28/314528/1; #P_asb_2021-08
fi;
if enterAndClear "system/sepolicy"; then if enterAndClear "system/sepolicy"; then
patch -p1 < "$DOS_PATCHES/android_system_sepolicy/0001-LGE_Fixes.patch"; #Fix -user builds for LGE devices patch -p1 < "$DOS_PATCHES/android_system_sepolicy/0001-LGE_Fixes.patch"; #Fix -user builds for LGE devices
patch -p1 < "$DOS_PATCHES/android_system_sepolicy/0001-LGE_Fixes.patch" --directory="prebuilts/api/28.0"; patch -p1 < "$DOS_PATCHES/android_system_sepolicy/0001-LGE_Fixes.patch" --directory="prebuilts/api/28.0";

View File

@ -148,11 +148,11 @@ if enterAndClear "hardware/qcom-caf/sdm845/audio"; then
patch -p1 < "$DOS_PATCHES/android_hardware_qcom_audio/0001-Unused-sdm845.patch"; #audio_extn: Fix unused parameter warning in utils.c patch -p1 < "$DOS_PATCHES/android_hardware_qcom_audio/0001-Unused-sdm845.patch"; #audio_extn: Fix unused parameter warning in utils.c
fi; fi;
if enterAndClear "hardware/qcom-caf/sdm8150/audio"; then if enterAndClear "hardware/qcom-caf/sm8150/audio"; then
patch -p1 < "$DOS_PATCHES/android_hardware_qcom_audio/0001-Unused-sm8150.patch"; #audio_extn: Fix unused parameter warning in utils.c patch -p1 < "$DOS_PATCHES/android_hardware_qcom_audio/0001-Unused-sm8150.patch"; #audio_extn: Fix unused parameter warning in utils.c
fi; fi;
if enterAndClear "hardware/qcom-caf/sdm8250/audio"; then if enterAndClear "hardware/qcom-caf/sm8250/audio"; then
patch -p1 < "$DOS_PATCHES/android_hardware_qcom_audio/0001-Unused-sm8150.patch"; #audio_extn: Fix unused parameter warning in utils.c patch -p1 < "$DOS_PATCHES/android_hardware_qcom_audio/0001-Unused-sm8150.patch"; #audio_extn: Fix unused parameter warning in utils.c
fi; fi;

View File

@ -71,7 +71,7 @@ export DOS_GPS_SUPL_HOST="supl.google.com"; #Options: supl.{google,vodafone,sony
#Release Processing #Release Processing
export DOS_MALWARE_SCAN_BEFORE_SIGN=false; #Scan device files for malware before signing export DOS_MALWARE_SCAN_BEFORE_SIGN=false; #Scan device files for malware before signing
export DOS_GENERATE_DELTAS=true; #Creates deltas from existing target_files in $DOS_BUILDS export DOS_GENERATE_DELTAS=true; #Creates deltas from existing target_files in $DOS_BUILDS
export DOS_GENERATE_DELTAS_DEVICES=('Amber' 'avicii' 'blueline' 'bonito' 'cheryl' 'coral' 'crosshatch' 'enchilada' 'fajita' 'flame' 'FP3' 'guacamole' 'guacamoleb' 'marlin' 'mata' 'pro1' 'sailfish' 'sargo' 'taimen' 'walleye'); #List of devices deltas will be generated for export DOS_GENERATE_DELTAS_DEVICES=('Amber' 'alioth' 'avicii' 'blueline' 'bonito' 'cheryl' 'coral' 'crosshatch' 'enchilada' 'fajita' 'flame' 'FP3' 'guacamole' 'guacamoleb' 'marlin' 'mata' 'pro1' 'sailfish' 'sargo' 'taimen' 'walleye'); #List of devices deltas will be generated for
export DOS_AUTO_ARCHIVE_BUILDS=true; #Copies files to $DOS_BUILDS after signing export DOS_AUTO_ARCHIVE_BUILDS=true; #Copies files to $DOS_BUILDS after signing
export DOS_REMOVE_AFTER=true; #Removes device OUT directory after complete to reclaim space. Requires AUTO_ARCHIVE_BUILDS=true export DOS_REMOVE_AFTER=true; #Removes device OUT directory after complete to reclaim space. Requires AUTO_ARCHIVE_BUILDS=true
export DOS_GPG_SIGNING=true; export DOS_GPG_SIGNING=true;