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

Merge changes from topics "revert-2897484-revert-2897682-dont_limit_systemsdk-JCOOOXGAIF-BSJGJAJAWC", "revert-2897568-revert-2894701-limit_systemsdk-WNEMOTGMRS-ROJNXPXKUV" into main am: 208444ce5d am: 6f83c4abd6

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2897685

Change-Id: I17df93cfb99b730105296e2fe01e1fc3381a1784
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2024-01-06 18:17:01 +00:00
committed by Automerger Merge Worker
parent c4d518459b 6f83c4abd6
commit 105db7de32
3 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
android/config.go
View File

@@ -1849,6 +1849,10 @@ func (c *deviceConfig) BuildBrokenInputDir(name string) bool {
return InList(name, c.config.productVariables.BuildBrokenInputDirModules) return InList(name, c.config.productVariables.BuildBrokenInputDirModules)
} }
func (c *deviceConfig) BuildBrokenDontCheckSystemSdk() bool {
return c.config.productVariables.BuildBrokenDontCheckSystemSdk
}
func (c *config) BuildWarningBadOptionalUsesLibsAllowlist() []string { func (c *config) BuildWarningBadOptionalUsesLibsAllowlist() []string {
return c.productVariables.BuildWarningBadOptionalUsesLibsAllowlist return c.productVariables.BuildWarningBadOptionalUsesLibsAllowlist
} }

2
android/sdk_version.go
View File

@@ -306,7 +306,7 @@ func SdkSpecFromWithConfig(config Config, str string) SdkSpec {
func (s SdkSpec) ValidateSystemSdk(ctx EarlyModuleContext) bool { func (s SdkSpec) ValidateSystemSdk(ctx EarlyModuleContext) bool {
// Do some early checks. This check is currently only for Java modules. And our only concern // Do some early checks. This check is currently only for Java modules. And our only concern
// is the use of "system" SDKs. // is the use of "system" SDKs.
if !isJava(ctx.Module()) || s.Kind != SdkSystem { if !isJava(ctx.Module()) || s.Kind != SdkSystem || ctx.DeviceConfig().BuildBrokenDontCheckSystemSdk() {
return true return true
} }

1
android/variable.go
View File

@@ -448,6 +448,7 @@ type ProductVariables struct {
BuildBrokenVendorPropertyNamespace bool `json:",omitempty"` BuildBrokenVendorPropertyNamespace bool `json:",omitempty"`
BuildBrokenIncorrectPartitionImages bool `json:",omitempty"` BuildBrokenIncorrectPartitionImages bool `json:",omitempty"`
BuildBrokenInputDirModules []string `json:",omitempty"` BuildBrokenInputDirModules []string `json:",omitempty"`
BuildBrokenDontCheckSystemSdk bool `json:",omitempty"`
BuildWarningBadOptionalUsesLibsAllowlist []string `json:",omitempty"` BuildWarningBadOptionalUsesLibsAllowlist []string `json:",omitempty"`