Merge "dexpreopt.config should be created even though unbundled image is built" am: 75d719fdd7 am: 1bc89a7af1

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

Change-Id: I4e91d1b293e84c69f032e148931357e2a050e10f
This commit is contained in:
Treehugger Robot
2021-07-15 09:28:40 +00:00
committed by Automerger Merge Worker
4 changed files with 15 additions and 8 deletions

View File

@@ -821,6 +821,12 @@ func (c *config) UnbundledBuildApps() bool {
return Bool(c.productVariables.Unbundled_build_apps)
}
// Returns true if building image that aren't bundled with the platform.
// UnbundledBuild() is always true when this is true.
func (c *config) UnbundledBuildImage() bool {
return Bool(c.productVariables.Unbundled_build_image)
}
// Returns true if building modules against prebuilt SDKs.
func (c *config) AlwaysUsePrebuiltSdks() bool {
return Bool(c.productVariables.Always_use_prebuilt_sdks)

View File

@@ -226,6 +226,7 @@ type productVariables struct {
Allow_missing_dependencies *bool `json:",omitempty"`
Unbundled_build *bool `json:",omitempty"`
Unbundled_build_apps *bool `json:",omitempty"`
Unbundled_build_image *bool `json:",omitempty"`
Always_use_prebuilt_sdks *bool `json:",omitempty"`
Skip_boot_jars_check *bool `json:",omitempty"`
Malloc_not_svelte *bool `json:",omitempty"`