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

Merge "Change type of Unbundled_build_apps from bool to []string" am: b3a4ff4fa5 am: afb25de476

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

Change-Id: Ibd046bdad10b6f98ac76e3a41c67c2b63fe5f38a
This commit is contained in:
Cole Faust
2021-11-25 01:42:52 +00:00
committed by Automerger Merge Worker
parent bbe6dfd463 afb25de476
commit d33989cf01
2 changed files with 28 additions and 27 deletions
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.
// UnbundledBuild() is always true when this is true.
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.

7
android/variable.go
View File

@@ -15,13 +15,14 @@
package android
import (
"android/soong/android/soongconfig"
"android/soong/bazel"
"fmt"
"reflect"
"runtime"
"strings"
"android/soong/android/soongconfig"
"android/soong/bazel"
"github.com/google/blueprint/proptools"
)
@@ -247,7 +248,7 @@ type productVariables struct {
Allow_missing_dependencies *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"`
Always_use_prebuilt_sdks *bool `json:",omitempty"`
Skip_boot_jars_check *bool `json:",omitempty"`