StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add bazel-built modules as deps on the system image

Browse Source 
These bazel-built modules will be installed into the system image
as part of the bazel rule, rather than going through the make staging
directory.

Bug: 297269187
Test: m bazel_sandwich
Change-Id: I96c6e58f8e0898b2ad92cb7069745ca2059a39f8
This commit is contained in:
Cole Faust
2023-10-13 11:32:14 -07:00
parent 03787bea6d
commit 11edf557b6
11 changed files with 300 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
android/variable.go
View File

@@ -494,38 +494,40 @@ type ProductVariables struct {
Release_expose_flagged_api *bool `json:",omitempty"`
}
type PartitionQualifiedVariablesType struct {
BuildingImage bool `json:",omitempty"`
BoardErofsCompressor string `json:",omitempty"`
BoardErofsCompressHints string `json:",omitempty"`
BoardErofsPclusterSize string `json:",omitempty"`
BoardExtfsInodeCount string `json:",omitempty"`
BoardExtfsRsvPct string `json:",omitempty"`
BoardF2fsSloadCompressFlags string `json:",omitempty"`
BoardFileSystemCompress string `json:",omitempty"`
BoardFileSystemType string `json:",omitempty"`
BoardJournalSize string `json:",omitempty"`
BoardPartitionReservedSize string `json:",omitempty"`
BoardPartitionSize string `json:",omitempty"`
BoardSquashfsBlockSize string `json:",omitempty"`
BoardSquashfsCompressor string `json:",omitempty"`
BoardSquashfsCompressorOpt string `json:",omitempty"`
BoardSquashfsDisable4kAlign string `json:",omitempty"`
ProductBaseFsPath string `json:",omitempty"`
ProductHeadroom string `json:",omitempty"`
ProductVerityPartition string `json:",omitempty"`
BoardAvbAddHashtreeFooterArgs string `json:",omitempty"`
BoardAvbKeyPath string `json:",omitempty"`
BoardAvbAlgorithm string `json:",omitempty"`
BoardAvbRollbackIndex string `json:",omitempty"`
BoardAvbRollbackIndexLocation string `json:",omitempty"`
}
type PartitionVariables struct {
ProductDirectory string `json:",omitempty"`
PartitionQualifiedVariables map[string]struct {
BuildingImage bool `json:",omitempty"`
BoardErofsCompressor string `json:",omitempty"`
BoardErofsCompressHints string `json:",omitempty"`
BoardErofsPclusterSize string `json:",omitempty"`
BoardExtfsInodeCount string `json:",omitempty"`
BoardExtfsRsvPct string `json:",omitempty"`
BoardF2fsSloadCompressFlags string `json:",omitempty"`
BoardFileSystemCompress string `json:",omitempty"`
BoardFileSystemType string `json:",omitempty"`
BoardJournalSize string `json:",omitempty"`
BoardPartitionReservedSize string `json:",omitempty"`
BoardPartitionSize string `json:",omitempty"`
BoardSquashfsBlockSize string `json:",omitempty"`
BoardSquashfsCompressor string `json:",omitempty"`
BoardSquashfsCompressorOpt string `json:",omitempty"`
BoardSquashfsDisable4kAlign string `json:",omitempty"`
ProductBaseFsPath string `json:",omitempty"`
ProductHeadroom string `json:",omitempty"`
ProductVerityPartition string `json:",omitempty"`
BoardAvbAddHashtreeFooterArgs string `json:",omitempty"`
BoardAvbKeyPath string `json:",omitempty"`
BoardAvbAlgorithm string `json:",omitempty"`
BoardAvbRollbackIndex string `json:",omitempty"`
BoardAvbRollbackIndexLocation string `json:",omitempty"`
}
TargetUserimagesUseExt2 bool `json:",omitempty"`
TargetUserimagesUseExt3 bool `json:",omitempty"`
TargetUserimagesUseExt4 bool `json:",omitempty"`
PartitionQualifiedVariables map[string]PartitionQualifiedVariablesType
TargetUserimagesUseExt2 bool `json:",omitempty"`
TargetUserimagesUseExt3 bool `json:",omitempty"`
TargetUserimagesUseExt4 bool `json:",omitempty"`
TargetUserimagesSparseExtDisabled bool `json:",omitempty"`
TargetUserimagesSparseErofsDisabled bool `json:",omitempty"`
@@ -546,6 +548,8 @@ type PartitionVariables struct {
CopyImagesForTargetFilesZip bool `json:",omitempty"`
BoardAvbEnable bool `json:",omitempty"`
ProductPackages []string `json:",omitempty"`
}
func boolPtr(v bool) *bool {