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

Commit fe1da759 authored by Pirama Arumuga Nainar's avatar Pirama Arumuga Nainar
Browse files

Revert "Revert "[pgo] Return updated Flags after adding flags for PGO/AFDO"" 

This reverts commit 988ff8d1.

Reason for revert: RBE can now handle PGO profiles during remote linking.

Bug: http://b/162702246

Test: m ANDROID_PGO_INSTRUMENT=hwui hwuimacro and check hwuimacro has
      PGO instrumentation.

Change-Id: I724b53dc086923beeb6f4b8903136545d18f4ece
parent 988ff8d1

cc/pgo.go

+4 −5
Original line number Diff line number Diff line
@@ -290,17 +290,16 @@ func (pgo *pgo) flags(ctx ModuleContext, flags Flags) Flags { 


	// Add flags to profile this module based on its profile_kind

	if props.ShouldProfileModule && props.isInstrumentation() {

		props.addInstrumentationProfileGatherFlags(ctx, flags)

		// Instrumentation PGO use and gather flags cannot coexist.

		return flags

		return props.addInstrumentationProfileGatherFlags(ctx, flags)

	} else if props.ShouldProfileModule && props.isSampling() {

		props.addSamplingProfileGatherFlags(ctx, flags)

		flags = props.addSamplingProfileGatherFlags(ctx, flags)

	} else if ctx.DeviceConfig().SamplingPGO() {

		props.addSamplingProfileGatherFlags(ctx, flags)

		flags = props.addSamplingProfileGatherFlags(ctx, flags)

	}



	if !ctx.Config().IsEnvTrue("ANDROID_PGO_NO_PROFILE_USE") {

		props.addProfileUseFlags(ctx, flags)

		flags = props.addProfileUseFlags(ctx, flags)

	}



	return flags