Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 937ae763 authored by Cole Faust's avatar Cole Faust Committed by Automerger Merge Worker
Browse files

Merge "Allow actions to read BUILD_BROKEN_INCORRECT_PARTITION_IMAGES" into... 

Merge "Allow actions to read BUILD_BROKEN_INCORRECT_PARTITION_IMAGES" into main am: 7a05d139 am: acb8ca12

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



Change-Id: Icfd6c48dbc0d4910b511939ba62ab5f6de8ef652
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents db25146c acb8ca12

android/variable.go

+11 −10
Original line number Diff line number Diff line
@@ -447,6 +447,7 @@ type ProductVariables struct { 
	BuildBrokenTrebleSyspropNeverallow  bool     `json:",omitempty"`

	BuildBrokenUsesSoongPython2Modules  bool     `json:",omitempty"`

	BuildBrokenVendorPropertyNamespace  bool     `json:",omitempty"`

	BuildBrokenIncorrectPartitionImages bool     `json:",omitempty"`

	BuildBrokenInputDirModules          []string `json:",omitempty"`



	BuildWarningBadOptionalUsesLibsAllowlist []string `json:",omitempty"`

bp2build/bp2build_product_config.go

+1 −0
Original line number Diff line number Diff line
@@ -261,6 +261,7 @@ func platformMappingSingleProduct( 
		result.WriteString(fmt.Sprintf("    --//build/bazel/product_config:apex_global_min_sdk_version_override=%s\n", proptools.String(productVariables.ApexGlobalMinSdkVersionOverride)))

		result.WriteString(fmt.Sprintf("    --//build/bazel/product_config:binder32bit=%t\n", proptools.Bool(productVariables.Binder32bit)))

		result.WriteString(fmt.Sprintf("    --//build/bazel/product_config:build_from_text_stub=%t\n", proptools.Bool(productVariables.Build_from_text_stub)))

		result.WriteString(fmt.Sprintf("    --//build/bazel/product_config:build_broken_incorrect_partition_images=%t\n", productVariables.BuildBrokenIncorrectPartitionImages))

		result.WriteString(fmt.Sprintf("    --//build/bazel/product_config:build_id=%s\n", proptools.String(productVariables.BuildId)))

		result.WriteString(fmt.Sprintf("    --//build/bazel/product_config:build_version_tags=%s\n", strings.Join(productVariables.BuildVersionTags, ",")))

		result.WriteString(fmt.Sprintf("    --//build/bazel/product_config:cfi_exclude_paths=%s\n", strings.Join(productVariables.CFIExcludePaths, ",")))

ui/build/ninja.go

+4 −0
Original line number Diff line number Diff line
@@ -194,6 +194,10 @@ func runNinjaForBuild(ctx Context, config Config) { 


			// LLVM compiler wrapper options

			"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()...)...)

	}