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

Commit 3cbc0f80 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Disable zipbomb detection inside the build" into main am: 3537d802 

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



Change-Id: I7a29127983789a5f38bc08aceba27af8b060d781
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents f7c5f647 3537d802

ui/build/config.go

+5 −0
Original line number Diff line number Diff line
@@ -437,6 +437,11 @@ func NewConfig(ctx Context, args ...string) Config { 
	ret.environ.Set("ANDROID_JAVA11_HOME", java11Home)

	ret.environ.Set("PATH", strings.Join(newPath, string(filepath.ListSeparator)))



	// b/286885495, https://bugzilla.redhat.com/show_bug.cgi?id=2227130: some versions of Fedora include patches

	// to unzip to enable zipbomb detection that incorrectly handle zip64 and data descriptors and fail on large

	// zip files produced by soong_zip.  Disable zipbomb detection.

	ret.environ.Set("UNZIP_DISABLE_ZIPBOMB_DETECTION", "TRUE")



	if ret.MultitreeBuild() {

		ret.environ.Set("MULTITREE_BUILD", "true")

	}