diff options
| author | mosimchah <mosimchah@gmail.com> | 2025-12-02 09:27:38 -0500 |
|---|---|---|
| committer | mosimchah <mosimchah@gmail.com> | 2025-12-02 09:27:38 -0500 |
| commit | c7bade461dc55726f62997d13a48582f7c4b4655 (patch) | |
| tree | ea0588da76060a2038f54f67efd046ca77634b10 /android/variable.go | |
| parent | 0f5414d19317805e8bbbe7c4db5f0fd78769bad5 (diff) | |
| parent | 89d78cff8b00d3b20a90074635c3fe5a2ee49474 (diff) | |
Merge branch 'lineage-23.1' of https://github.com/LineageOS/android_build_soong into HEADw16.1
* 'lineage-23.1' of https://github.com/LineageOS/android_build_soong: (528 commits)
Revert "install_symlink: Make symlink target configurable"
Reapply "Clear as much of cc.Module as possible after GenerateBuildActions"
Revert "rust: config: Fix missing CPU variant LD flags in Rust"
Rename build-flag in outdir
Revert^4 "cipd: Default CIPD proxy server to on, add opt-out"
Convert check-vintf-all to phony with actions
Create a partial implementation of check-vintf-all for soong-only
Configure RBE rust pool based on build variant
Revert^3 "Add sdk version check to arr"
Add jdk.internal.invoke to the allowlist
Make droid always depend on symbols zip
Import Device and Odm skus
Don't install gob_gen in Soong
Remove bazel reference from run_integration_tests.sh
Fix bootstrap_test.sh
Don't panic in aconfig libraries when AllowMissingDependencies is set
Avoid returning nil paths from PathForModuleSrc
Revert "Flag controled clang version"
Rework module target dependencies on required deps
Revert^2 "Add sdk version check to arr"
...
Change-Id: I6e9a63fa14fda917a42e426e5dcebbad7f67e1de
Diffstat (limited to 'android/variable.go')
| -rw-r--r-- | android/variable.go | 65 |
1 files changed, 45 insertions, 20 deletions
diff --git a/android/variable.go b/android/variable.go index e9ba1b34e..9b0605592 100644 --- a/android/variable.go +++ b/android/variable.go @@ -295,7 +295,6 @@ type ProductVariables struct { Safestack *bool `json:",omitempty"` HostStaticBinaries *bool `json:",omitempty"` Binder32bit *bool `json:",omitempty"` - UseGoma *bool `json:",omitempty"` UseABFS *bool `json:",omitempty"` UseRBE *bool `json:",omitempty"` UseRBEJAVAC *bool `json:",omitempty"` @@ -397,8 +396,8 @@ type ProductVariables struct { BoardSepolicyVers *string `json:",omitempty"` PlatformSepolicyVersion *string `json:",omitempty"` - SystemExtSepolicyPrebuiltApiDir *string `json:",omitempty"` - ProductSepolicyPrebuiltApiDir *string `json:",omitempty"` + SystemExtSepolicyPrebuiltApiDirs []string `json:",omitempty"` + ProductSepolicyPrebuiltApiDirs []string `json:",omitempty"` PlatformSepolicyCompatVersions []string `json:",omitempty"` @@ -455,7 +454,6 @@ type ProductVariables struct { BuildBrokenClangAsFlags bool `json:",omitempty"` BuildBrokenClangCFlags bool `json:",omitempty"` BuildBrokenClangProperty bool `json:",omitempty"` - GenruleSandboxing *bool `json:",omitempty"` BuildBrokenEnforceSyspropOwner bool `json:",omitempty"` BuildBrokenTrebleSyspropNeverallow bool `json:",omitempty"` BuildBrokenVendorPropertyNamespace bool `json:",omitempty"` @@ -464,8 +462,6 @@ type ProductVariables struct { BuildBrokenDontCheckSystemSdk bool `json:",omitempty"` BuildBrokenDupSysprop bool `json:",omitempty"` - BuildWarningBadOptionalUsesLibsAllowlist []string `json:",omitempty"` - BuildDebugfsRestrictionsEnabled bool `json:",omitempty"` RequiresInsecureExecmemForSwiftshader bool `json:",omitempty"` @@ -546,11 +542,27 @@ type ProductVariables struct { SystemManifestFile []string `json:",omitempty"` SystemExtManifestFiles []string `json:",omitempty"` DeviceManifestFiles []string `json:",omitempty"` + DeviceManifestSkus []string `json:",omitempty"` OdmManifestFiles []string `json:",omitempty"` + OdmManifestSkus []string `json:",omitempty"` UseSoongNoticeXML *bool `json:",omitempty"` StripByDefault *bool `json:",omitempty"` + + CompatibilityTestcases map[string]CompatibilityTestcaseJSON + + // Will be used to install host tools in soong only builds + ProductHostPackages []string `json:",omitempty"` + + EnforceSELinuxTrebleLabeling *bool `json:",omitempty"` + + SELinuxTrebleLabelingTrackingListFile *string `json:",omitempty"` +} + +type CompatibilityTestcaseJSON struct { + OutDir string `json:",omitempty"` + IncludeModuleFolder bool `json:",omitempty"` } type PartitionQualifiedVariablesType struct { @@ -638,6 +650,7 @@ type PartitionVariables struct { BoardVendorBootimagePartitionSize string `json:",omitempty"` BoardInitBootimagePartitionSize string `json:",omitempty"` BoardBootHeaderVersion string `json:",omitempty"` + BoardInitBootHeaderVersion string `json:",omitempty"` TargetKernelPath string `json:",omitempty"` BoardUsesGenericKernelImage bool `json:",omitempty"` BootSecurityPatch string `json:",omitempty"` @@ -676,31 +689,41 @@ type PartitionVariables struct { BuildingVbmetaImage bool `json:",omitempty"` ChainedVbmetaPartitions map[string]ChainedAvbPartitionProps `json:",omitempty"` - ProductPackages []string `json:",omitempty"` - ProductPackagesDebug []string `json:",omitempty"` - VendorLinkerConfigSrcs []string `json:",omitempty"` - ProductLinkerConfigSrcs []string `json:",omitempty"` + ProductPackages []string `json:",omitempty"` + ProductPackagesDebug []string `json:",omitempty"` + ProductPackagesEng []string `json:",omitempty"` + ProductPackagesDebugAsan []string `json:",omitempty"` + ProductPackagesDebugJavaCoverage []string `json:",omitempty"` + ProductPackagesArm64 []string `json:",omitempty"` + ProductPackagesShippingApiLevel29 []string `json:",omitempty"` + ProductPackagesShippingApiLevel33 []string `json:",omitempty"` + ProductPackagesShippingApiLevel34 []string `json:",omitempty"` + VendorLinkerConfigSrcs []string `json:",omitempty"` + ProductLinkerConfigSrcs []string `json:",omitempty"` BoardInfoFiles []string `json:",omitempty"` BootLoaderBoardName string `json:",omitempty"` ProductCopyFiles []string `json:",omitempty"` - BuildingSystemDlkmImage bool `json:",omitempty"` - SystemKernelModules []string `json:",omitempty"` - SystemKernelBlocklistFile string `json:",omitempty"` - SystemKernelLoadModules []string `json:",omitempty"` - BuildingVendorDlkmImage bool `json:",omitempty"` - VendorKernelModules []string `json:",omitempty"` - VendorKernelBlocklistFile string `json:",omitempty"` - BuildingOdmDlkmImage bool `json:",omitempty"` - OdmKernelModules []string `json:",omitempty"` - OdmKernelBlocklistFile string `json:",omitempty"` + BuildingSystemDlkmImage bool `json:",omitempty"` + SystemKernelModules []string `json:",omitempty"` + SystemKernelBlocklistFile string `json:",omitempty"` + SystemKernelLoadModules []string `json:",omitempty"` + BuildingVendorDlkmImage bool `json:",omitempty"` + VendorKernelModules []string `json:",omitempty"` + VendorKernelBlocklistFile string `json:",omitempty"` + VendorKernelModules2ndStage16kbMode []string `json:",omitempty"` + BuildingOdmDlkmImage bool `json:",omitempty"` + OdmKernelModules []string `json:",omitempty"` + OdmKernelBlocklistFile string `json:",omitempty"` VendorRamdiskKernelModules []string `json:",omitempty"` VendorRamdiskKernelBlocklistFile string `json:",omitempty"` VendorRamdiskKernelLoadModules []string `json:",omitempty"` VendorRamdiskKernelOptionsFile string `json:",omitempty"` + DoNotStripVendorRamdiskModules bool `json:",omitempty"` + DoNotStripVendorModules bool `json:",omitempty"` ProductFsverityGenerateMetadata bool `json:",omitempty"` @@ -721,6 +744,8 @@ type PartitionVariables struct { BootloaderInUpdatePackage bool `json:",omitempty"` BoardFastbootInfoFile string `json:",omitempty"` + + TargetRecoveryWipe string `json:",omitempty"` } func boolPtr(v bool) *bool { |
