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

Commit 55f50583 authored by Christoffer Adamsen's avatar Christoffer Adamsen Committed by Automerger Merge Worker
Browse files

Merge "Configure R8 store-store-fence constructor inlining when enabled" into main am: 5c46a815 

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



Change-Id: Ib5d8194fba6a60081e8f43b743ab76ad09ac345d
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents d2a06fe7 5c46a815

android/config.go

+4 −0
Original line number Diff line number Diff line
@@ -2172,6 +2172,10 @@ func (c *config) UseTransitiveJarsInClasspath() bool { 
	return c.productVariables.GetBuildFlagBool("RELEASE_USE_TRANSITIVE_JARS_IN_CLASSPATH")

}



func (c *config) UseR8StoreStoreFenceConstructorInlining() bool {

	return c.productVariables.GetBuildFlagBool("RELEASE_R8_STORE_STORE_FENCE_CONSTRUCTOR_INLINING")

}



func (c *config) UseDexV41() bool {

	return c.productVariables.GetBuildFlagBool("RELEASE_USE_DEX_V41")

}

java/dex.go

+4 −0
Original line number Diff line number Diff line
@@ -412,6 +412,10 @@ func (d *dexer) r8Flags(ctx android.ModuleContext, dexParams *compileDexParams, 
		artProfileOutput = profileOutput

	}



	if ctx.Config().UseR8StoreStoreFenceConstructorInlining() {

		r8Flags = append(r8Flags, "--store-store-fence-constructor-inlining")

	}



	return r8Flags, r8Deps, artProfileOutput

}