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

Merge "Platform mapping-based product config" into main am: 66ef2ff97f am: b74818b55d am: 4b7519d350 am: 470a5e359b am: 6dee30bbc8

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

Change-Id: I032d710efb199cb03cfccfde8a87cb983d6b746e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Cole Faust
2023-07-18 19:53:22 +00:00
committed by Automerger Merge Worker
parent 330f700d71 6dee30bbc8
commit a78a73393b
12 changed files with 134 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
android/config.go
View File

@@ -202,10 +202,10 @@ type VendorConfig soongconfig.SoongConfig
// product configuration values are read from Kati-generated soong.variables.
type config struct {
// Options configurable with soong.variables
productVariables productVariables
productVariables ProductVariables
// Only available on configs created by TestConfig
TestProductVariables *productVariables
TestProductVariables *ProductVariables
// A specialized context object for Bazel/Soong mixed builds and migration
// purposes.
@@ -321,7 +321,7 @@ func loadConfig(config *config) error {
// loadFromConfigFile loads and decodes configuration options from a JSON file
// in the current working directory.
func loadFromConfigFile(configurable *productVariables, filename string) error {
func loadFromConfigFile(configurable *ProductVariables, filename string) error {
// Try to open the file
configFileReader, err := os.Open(filename)
defer configFileReader.Close()
@@ -373,7 +373,7 @@ func loadFromConfigFile(configurable *productVariables, filename string) error {
// atomically writes the config file in case two copies of soong_build are running simultaneously
// (for example, docs generation and ninja manifest generation)
func saveToConfigFile(config *productVariables, filename string) error {
func saveToConfigFile(config *ProductVariables, filename string) error {
data, err := json.MarshalIndent(&config, "", " ")
if err != nil {
return fmt.Errorf("cannot marshal config data: %s", err.Error())
@@ -402,7 +402,7 @@ func saveToConfigFile(config *productVariables, filename string) error {
return nil
}
func saveToBazelConfigFile(config *productVariables, outDir string) error {
func saveToBazelConfigFile(config *ProductVariables, outDir string) error {
dir := filepath.Join(outDir, bazel.SoongInjectionDirName, "product_config")
err := createDirIfNonexistent(dir, os.ModePerm)
if err != nil {