tequilaOS/platform_build_soong
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Change type of Unbundled_build_apps from bool to []string

Browse source 
Unbundled_build_apps is supposed to be a list of apps to
build as unbundled, not just a simple boolean. Change it
to properly reflect what it is, because the starlark
product configuration relies on soong's interpretation
of variables types.

Bug: 201700692
Test: Presubmits
Change-Id: I85d40d58fe519f9f6e5a382b8f3ec9014f990aa1
This commit is contained in:
Cole Faust 2021-11-23 19:02:08 -08:00
parent b3b28012b9
commit 701ca2545e
2 changed files with 28 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
android/config.go
View file

@ -856,7 +856,7 @@ func (c *config) UnbundledBuild() bool {
// Returns true if building apps that aren't bundled with the platform. // Returns true if building apps that aren't bundled with the platform.
// UnbundledBuild() is always true when this is true. // UnbundledBuild() is always true when this is true.
func (c *config) UnbundledBuildApps() bool { func (c *config) UnbundledBuildApps() bool {
return Bool(c.productVariables.Unbundled_build_apps) return len(c.productVariables.Unbundled_build_apps) > 0
} }
// Returns true if building image that aren't bundled with the platform. // Returns true if building image that aren't bundled with the platform.

53
android/variable.go
View file

@ -15,13 +15,14 @@
package android package android
import ( import (
"android/soong/android/soongconfig"
"android/soong/bazel"
"fmt" "fmt"
"reflect" "reflect"
"runtime" "runtime"
"strings" "strings"
"android/soong/android/soongconfig"
"android/soong/bazel"
"github.com/google/blueprint/proptools" "github.com/google/blueprint/proptools"
) )
@ -245,30 +246,30 @@ 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"`
Unbundled_build_apps *bool `json:",omitempty"` Unbundled_build_apps []string `json:",omitempty"`
Unbundled_build_image *bool `json:",omitempty"` Unbundled_build_image *bool `json:",omitempty"`
Always_use_prebuilt_sdks *bool `json:",omitempty"` Always_use_prebuilt_sdks *bool `json:",omitempty"`
Skip_boot_jars_check *bool `json:",omitempty"` Skip_boot_jars_check *bool `json:",omitempty"`
Malloc_not_svelte *bool `json:",omitempty"` Malloc_not_svelte *bool `json:",omitempty"`
Malloc_zero_contents *bool `json:",omitempty"` Malloc_zero_contents *bool `json:",omitempty"`
Malloc_pattern_fill_contents *bool `json:",omitempty"` Malloc_pattern_fill_contents *bool `json:",omitempty"`
Safestack *bool `json:",omitempty"` Safestack *bool `json:",omitempty"`
HostStaticBinaries *bool `json:",omitempty"` HostStaticBinaries *bool `json:",omitempty"`
Binder32bit *bool `json:",omitempty"` Binder32bit *bool `json:",omitempty"`
UseGoma *bool `json:",omitempty"` UseGoma *bool `json:",omitempty"`
UseRBE *bool `json:",omitempty"` UseRBE *bool `json:",omitempty"`
UseRBEJAVAC *bool `json:",omitempty"` UseRBEJAVAC *bool `json:",omitempty"`
UseRBER8 *bool `json:",omitempty"` UseRBER8 *bool `json:",omitempty"`
UseRBED8 *bool `json:",omitempty"` UseRBED8 *bool `json:",omitempty"`
Debuggable *bool `json:",omitempty"` Debuggable *bool `json:",omitempty"`
Eng *bool `json:",omitempty"` Eng *bool `json:",omitempty"`
Treble_linker_namespaces *bool `json:",omitempty"` Treble_linker_namespaces *bool `json:",omitempty"`
Enforce_vintf_manifest *bool `json:",omitempty"` Enforce_vintf_manifest *bool `json:",omitempty"`
Uml *bool `json:",omitempty"` Uml *bool `json:",omitempty"`
Arc *bool `json:",omitempty"` Arc *bool `json:",omitempty"`
MinimizeJavaDebugInfo *bool `json:",omitempty"` MinimizeJavaDebugInfo *bool `json:",omitempty"`
Check_elf_files *bool `json:",omitempty"` Check_elf_files *bool `json:",omitempty"`