mirror of
https://github.com/Divested-Mobile/DivestOS-Build.git
synced 2024-10-01 01:35:54 -04:00
Pixel 6/7 compiling
Signed-off-by: Tad <tad@spotco.us>
This commit is contained in:
parent
ad5de60266
commit
23a723feb1
@ -271,6 +271,8 @@ echo "Deblobbing...";
|
|||||||
blobs=$blobs"|HardwareInfo.apk";
|
blobs=$blobs"|HardwareInfo.apk";
|
||||||
blobs=$blobs"|SCONE.apk"; #???
|
blobs=$blobs"|SCONE.apk"; #???
|
||||||
blobs=$blobs"|DevicePersonalizationPrebuilt.*.apk|DeviceIntelligence.*.apk";
|
blobs=$blobs"|DevicePersonalizationPrebuilt.*.apk|DeviceIntelligence.*.apk";
|
||||||
|
blobs=$blobs"|QualifiedNetworksService.apk";
|
||||||
|
blobs=$blobs"|qualifiednetworksservice.xml";
|
||||||
blobs=$blobs"|libhwinfo.jar|com.google.android.hardwareinfo.xml";
|
blobs=$blobs"|libhwinfo.jar|com.google.android.hardwareinfo.xml";
|
||||||
overlay=$overlay"|config_defaultAttentionService|config_defaultSystemCaptionsManagerService|config_defaultSystemCaptionsService|config_systemAmbientAudioIntelligence|config_systemAudioIntelligence|config_systemNotificationIntelligence|config_systemTextIntelligence|config_systemUiIntelligence|config_systemVisualIntelligence|config_defaultContentSuggestionsService";
|
overlay=$overlay"|config_defaultAttentionService|config_defaultSystemCaptionsManagerService|config_defaultSystemCaptionsService|config_systemAmbientAudioIntelligence|config_systemAudioIntelligence|config_systemNotificationIntelligence|config_systemTextIntelligence|config_systemUiIntelligence|config_systemVisualIntelligence|config_defaultContentSuggestionsService";
|
||||||
overlay=$overlay"|config_defaultWellbeingPackage|config_defaultSupervisionProfileOwnerComponent";
|
overlay=$overlay"|config_defaultWellbeingPackage|config_defaultSupervisionProfileOwnerComponent";
|
||||||
|
@ -49,19 +49,22 @@ enableAVB() {
|
|||||||
fi;
|
fi;
|
||||||
#Disable chaining
|
#Disable chaining
|
||||||
awk -i inplace '!/BOARD_AVB_VBMETA_SYSTEM/' *.mk &>/dev/null || true;
|
awk -i inplace '!/BOARD_AVB_VBMETA_SYSTEM/' *.mk &>/dev/null || true;
|
||||||
|
awk -i inplace '!/BOARD_AVB_VBMETA_VENDOR/' *.mk &>/dev/null || true;
|
||||||
awk -i inplace '!/BOARD_AVB_BOOT/' *.mk &>/dev/null || true;
|
awk -i inplace '!/BOARD_AVB_BOOT/' *.mk &>/dev/null || true;
|
||||||
#awk -i inplace '!/BOARD_AVB_RECOVERY/' *.mk &>/dev/null || true; #Must be defined for if non-A/B is supported.
|
#awk -i inplace '!/BOARD_AVB_RECOVERY/' *.mk &>/dev/null || true; #Must be defined for if non-A/B is supported.
|
||||||
awk -i inplace '!/vbmeta_system \\/' *.mk &>/dev/null || true;
|
awk -i inplace '!/vbmeta_system \\/' *.mk &>/dev/null || true;
|
||||||
|
awk -i inplace '!/vbmeta_vendor \\/' *.mk &>/dev/null || true;
|
||||||
sed -i 's/vbmeta_system//' *.mk &>/dev/null || true;
|
sed -i 's/vbmeta_system//' *.mk &>/dev/null || true;
|
||||||
|
sed -i 's/vbmeta_vendor//' *.mk &>/dev/null || true;
|
||||||
sed -i '/\/system /{s|avb=vbmeta_system|avb=vbmeta|}' *fstab* */*fstab* */*/*fstab* &>/dev/null || true;
|
sed -i '/\/system /{s|avb=vbmeta_system|avb=vbmeta|}' *fstab* */*fstab* */*/*fstab* &>/dev/null || true;
|
||||||
sed -i '/\/system_ext/{s|avb=vbmeta_system|avb|}' *fstab* */*fstab* */*/*fstab* &>/dev/null || true;
|
sed -i '/\/system_ext/{s|avb=vbmeta_system|avb|}' *fstab* */*fstab* */*/*fstab* &>/dev/null || true;
|
||||||
sed -i '/\/system_ext/{s|avb=vbmeta|avb|}' *fstab* */*fstab* */*/*fstab* &>/dev/null || true;
|
sed -i '/\/system_ext/{s|avb=vbmeta|avb|}' *fstab* */*fstab* */*/*fstab* &>/dev/null || true;
|
||||||
sed -i '/\/vendor/{s|avb=vbmeta_system|avb|}' *fstab* */*fstab* */*/*fstab* &>/dev/null || true;
|
sed -i '/\/vendor/{s|avb=vbmeta_system|avb|}' *fstab* */*fstab* */*/*fstab* &>/dev/null || true;
|
||||||
sed -i '/\/vendor/{s|avb=vbmeta_vendor|avb|}' *fstab* */*fstab* */*/*fstab* &>/dev/null || true;
|
sed -i '/\/vendor/{s|avb=vbmeta_vendor|avb|}' *fstab* */*fstab* */*/*fstab* &>/dev/null || true;
|
||||||
sed -i '/\/vendor/{s|avb=vbmeta|avb|}' *fstab* */*fstab* */*/*fstab* &>/dev/null || true;
|
sed -i '/\/vendor/{s|avb=vbmeta|avb|}' *fstab* */*fstab* */*/*fstab* &>/dev/null || true;
|
||||||
sed -i '/\/pvmfw/{s|avb=pvmfw|avb|}' *fstab* */*fstab* */*/*fstab* &>/dev/null || true;
|
#sed -i '/\/pvmfw/{s|avb=pvmfw|avb|}' *fstab* */*fstab* */*/*fstab* &>/dev/null || true;
|
||||||
sed -i '/\/boot/{s|avb=boot|avb|}' *fstab* */*fstab* */*/*fstab* &>/dev/null || true;
|
#sed -i '/\/boot/{s|avb=boot|avb|}' *fstab* */*fstab* */*/*fstab* &>/dev/null || true;
|
||||||
sed -i '/\/init_boot/{s|avb=init_boot|avb|}' *fstab* */*fstab* */*/*fstab* &>/dev/null || true;
|
#sed -i '/\/init_boot/{s|avb=init_boot|avb|}' *fstab* */*fstab* */*/*fstab* &>/dev/null || true;
|
||||||
sed -i '/\/product/{s|avb=vbmeta_system|avb|}' *fstab* */*fstab* */*/*fstab* &>/dev/null || true;
|
sed -i '/\/product/{s|avb=vbmeta_system|avb|}' *fstab* */*fstab* */*/*fstab* &>/dev/null || true;
|
||||||
sed -i '/\/product/{s|avb=vbmeta|avb|}' *fstab* */*fstab* */*/*fstab* &>/dev/null || true;
|
sed -i '/\/product/{s|avb=vbmeta|avb|}' *fstab* */*fstab* */*/*fstab* &>/dev/null || true;
|
||||||
#TODO: remove avb_keys=.*?
|
#TODO: remove avb_keys=.*?
|
||||||
|
@ -87,11 +87,11 @@ buildAll() {
|
|||||||
buildDevice bonito avb;
|
buildDevice bonito avb;
|
||||||
buildDevice sargo avb;
|
buildDevice sargo avb;
|
||||||
#Tensor
|
#Tensor
|
||||||
#buildDevice oriole avb;
|
buildDevice oriole avb;
|
||||||
#buildDevice raven avb;
|
buildDevice raven avb;
|
||||||
#buildDevice bluejay avb;
|
buildDevice bluejay avb;
|
||||||
#buildDevice panther avb;
|
buildDevice panther avb;
|
||||||
#buildDevice cheetah avb;
|
buildDevice cheetah avb;
|
||||||
}
|
}
|
||||||
export -f buildAll;
|
export -f buildAll;
|
||||||
|
|
||||||
|
@ -410,6 +410,15 @@ fi;
|
|||||||
#
|
#
|
||||||
#START OF DEVICE CHANGES
|
#START OF DEVICE CHANGES
|
||||||
#
|
#
|
||||||
|
if enterAndClear "device/google/gs101"; then
|
||||||
|
sed -i '/Virtualization/,+7d' device.mk;
|
||||||
|
fi;
|
||||||
|
|
||||||
|
if enterAndClear "device/google/gs201"; then
|
||||||
|
sed -i '/Virtualization/,+1d' device.mk;
|
||||||
|
sed -i '/PRODUCT_BUILD_PVMFW_IMAGE/,+2d' device.mk;
|
||||||
|
awk -i inplace '!/PRODUCT_PACKAGES/' widevine/device.mk;
|
||||||
|
fi;
|
||||||
|
|
||||||
if enterAndClear "device/google/redbull"; then
|
if enterAndClear "device/google/redbull"; then
|
||||||
awk -i inplace '!/sctp/' BoardConfig-common.mk modules.load; #fix compile after hardenDefconfig
|
awk -i inplace '!/sctp/' BoardConfig-common.mk modules.load; #fix compile after hardenDefconfig
|
||||||
|
Loading…
Reference in New Issue
Block a user