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

Merge "Rename build.ninja with product name" am: 5500fc89c1 am: babe56a6c8 am: 1fcb13ac2e am: 0b814fe80e am: 4704391ec7 am: d5ca114a34

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

Change-Id: I4221a16074afd86ae987c84de5d612735ae05630
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Kiyoung Kim
2023-05-30 12:00:19 +00:00
committed by Automerger Merge Worker
parent af2b09fd77 d5ca114a34
commit b96142759c
4 changed files with 91 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
android/config.go
View File

@@ -80,9 +80,10 @@ type SoongBuildMode int
type CmdArgs struct {
bootstrap.Args
RunGoTests bool
OutDir string
SoongOutDir string
RunGoTests bool
OutDir string
SoongOutDir string
SoongVariables string
SymlinkForestMarker string
Bp2buildMarker string
@@ -491,7 +492,7 @@ func NullConfig(outDir, soongOutDir string) Config {
func NewConfig(cmdArgs CmdArgs, availableEnv map[string]string) (Config, error) {
// Make a config with default options.
config := &config{
ProductVariablesFileName: filepath.Join(cmdArgs.SoongOutDir, productVariablesFileName),
ProductVariablesFileName: cmdArgs.SoongVariables,
env: availableEnv,