Merge "Revert "Allow actions to read BUILD_BROKEN_INCORRECT_PARTITION_I..."" into main am: e2e3172dba
am: a5d8a314db
am: 4181728a55
am: 00f9506380
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2746514 Change-Id: I32cdf79f9362472b27060b6fe70e97a9214cf3b3 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -194,10 +194,6 @@ func runNinjaForBuild(ctx Context, config Config) {
|
|||||||
|
|
||||||
// LLVM compiler wrapper options
|
// LLVM compiler wrapper options
|
||||||
"TOOLCHAIN_RUSAGE_OUTPUT",
|
"TOOLCHAIN_RUSAGE_OUTPUT",
|
||||||
|
|
||||||
// We don't want this build broken flag to cause reanalysis, so allow it through to the
|
|
||||||
// actions.
|
|
||||||
"BUILD_BROKEN_INCORRECT_PARTITION_IMAGES",
|
|
||||||
}, config.BuildBrokenNinjaUsesEnvVars()...)...)
|
}, config.BuildBrokenNinjaUsesEnvVars()...)...)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user