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

Merge "Add a flag to allow unbundled builds to build SDKs from source"

Browse Source
This commit is contained in:
Colin Cross
2018-12-20 00:35:59 +00:00
committed by Gerrit Code Review
parent 894139e655 1f367bfe8b
commit a044a686c5
4 changed files with 23 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
android/config.go
View File

@@ -569,6 +569,10 @@ func (c *config) UnbundledBuild() bool {
return Bool(c.productVariables.Unbundled_build) return Bool(c.productVariables.Unbundled_build)
} }
func (c *config) UnbundledBuildPrebuiltSdks() bool {
return Bool(c.productVariables.Unbundled_build) && !Bool(c.productVariables.Unbundled_build_sdks_from_source)
}
func (c *config) IsPdkBuild() bool { func (c *config) IsPdkBuild() bool {
return Bool(c.productVariables.Pdk) return Bool(c.productVariables.Pdk)
} }

33
android/variable.go
View File

@@ -177,22 +177,23 @@ type productVariables struct {
AppsDefaultVersionName *string `json:",omitempty"` AppsDefaultVersionName *string `json:",omitempty"`
Allow_missing_dependencies *bool `json:",omitempty"` Allow_missing_dependencies *bool `json:",omitempty"`
Unbundled_build *bool `json:",omitempty"` Unbundled_build *bool `json:",omitempty"`
Malloc_not_svelte *bool `json:",omitempty"` Unbundled_build_sdks_from_source *bool `json:",omitempty"`
Safestack *bool `json:",omitempty"` Malloc_not_svelte *bool `json:",omitempty"`
HostStaticBinaries *bool `json:",omitempty"` Safestack *bool `json:",omitempty"`
Binder32bit *bool `json:",omitempty"` HostStaticBinaries *bool `json:",omitempty"`
UseGoma *bool `json:",omitempty"` Binder32bit *bool `json:",omitempty"`
Debuggable *bool `json:",omitempty"` UseGoma *bool `json:",omitempty"`
Eng *bool `json:",omitempty"` Debuggable *bool `json:",omitempty"`
Treble_linker_namespaces *bool `json:",omitempty"` Eng *bool `json:",omitempty"`
Enforce_vintf_manifest *bool `json:",omitempty"` Treble_linker_namespaces *bool `json:",omitempty"`
Pdk *bool `json:",omitempty"` Enforce_vintf_manifest *bool `json:",omitempty"`
Uml *bool `json:",omitempty"` Pdk *bool `json:",omitempty"`
Use_lmkd_stats_log *bool `json:",omitempty"` Uml *bool `json:",omitempty"`
Arc *bool `json:",omitempty"` Use_lmkd_stats_log *bool `json:",omitempty"`
MinimizeJavaDebugInfo *bool `json:",omitempty"` Arc *bool `json:",omitempty"`
MinimizeJavaDebugInfo *bool `json:",omitempty"`
UncompressPrivAppDex *bool `json:",omitempty"` UncompressPrivAppDex *bool `json:",omitempty"`
ModulesLoadedByPrivilegedModules []string `json:",omitempty"` ModulesLoadedByPrivilegedModules []string `json:",omitempty"`

2
java/aar.go
View File

@@ -443,7 +443,7 @@ func (a *AARImport) Name() string {
} }
func (a *AARImport) DepsMutator(ctx android.BottomUpMutatorContext) { func (a *AARImport) DepsMutator(ctx android.BottomUpMutatorContext) {
if !ctx.Config().UnbundledBuild() { if !ctx.Config().UnbundledBuildPrebuiltSdks() {
sdkDep := decodeSdkDep(ctx, sdkContext(a)) sdkDep := decodeSdkDep(ctx, sdkContext(a))
if sdkDep.useModule && sdkDep.frameworkResModule != "" { if sdkDep.useModule && sdkDep.frameworkResModule != "" {
ctx.AddVariationDependencies(nil, frameworkResTag, sdkDep.frameworkResModule) ctx.AddVariationDependencies(nil, frameworkResTag, sdkDep.frameworkResModule)

2
java/java.go
View File

@@ -555,7 +555,7 @@ func decodeSdkDep(ctx android.BaseContext, sdkContext sdkContext) sdkDep {
return ret return ret
} }
if ctx.Config().UnbundledBuild() && v != "" { if ctx.Config().UnbundledBuildPrebuiltSdks() && v != "" {
return toPrebuilt(v) return toPrebuilt(v)
} }