Merge "Disable Hidden API Checks for ENG Builds" into main (d938f83b) · Commits · e / os / android_build_soong

android/config.go

+13 −0

Original line number	Diff line number	Diff line
		@@ -170,6 +170,19 @@ func (c Config) RunningInsideUnitTest() bool {
		return c.config.TestProductVariables != nil
		}

		// DisableHiddenApiChecks returns true if hiddenapi checks have been disabled.
		// For 'eng' target variant hiddenapi checks are disabled by default for performance optimisation,
		// but can be enabled by setting environment variable ENABLE_HIDDENAPI_FLAGS=true.
		// For other target variants hiddenapi check are enabled by default but can be disabled by
		// setting environment variable UNSAFE_DISABLE_HIDDENAPI_FLAGS=true.
		// If both ENABLE_HIDDENAPI_FLAGS=true and UNSAFE_DISABLE_HIDDENAPI_FLAGS=true, then
		// ENABLE_HIDDENAPI_FLAGS=true will be triggered and hiddenapi checks will be considered enabled.
		func (c Config) DisableHiddenApiChecks() bool {
		return !c.IsEnvTrue("ENABLE_HIDDENAPI_FLAGS") &&
		(c.IsEnvTrue("UNSAFE_DISABLE_HIDDENAPI_FLAGS") \|\|
		Bool(c.productVariables.Eng))
		}

		// MaxPageSizeSupported returns the max page size supported by the device. This
		// value will define the ELF segment alignment for binaries (executables and
		// shared libraries).

+1 −1

Original line number	Diff line number	Diff line
		@@ -106,7 +106,7 @@ func (h *hiddenAPI) initHiddenAPI(ctx android.ModuleContext, dexJar OptionalDexJ
		h.uncompressDexState = uncompressedDexState

		// If hiddenapi processing is disabled treat this as inactive.
		if ctx.Config().IsEnvTrue("UNSAFE_DISABLE_HIDDENAPI_FLAGS") {
		if ctx.Config().DisableHiddenApiChecks() {
		return
		}

+2 −2

Original line number	Diff line number	Diff line
		@@ -121,8 +121,8 @@ type hiddenAPISingleton struct {

		// hiddenAPI singleton rules
		func (h *hiddenAPISingleton) GenerateBuildActions(ctx android.SingletonContext) {
		// Don't run any hiddenapi rules if UNSAFE_DISABLE_HIDDENAPI_FLAGS=true
		if ctx.Config().IsEnvTrue("UNSAFE_DISABLE_HIDDENAPI_FLAGS") {
		// Don't run any hiddenapi rules if hiddenapi checks are disabled
		if ctx.Config().DisableHiddenApiChecks() {
		return
		}

+3 −3

Original line number	Diff line number	Diff line
		@@ -113,7 +113,7 @@ func (b *platformBootclasspathModule) DepsMutator(ctx android.BottomUpMutatorCon
		}

		func (b *platformBootclasspathModule) hiddenAPIDepsMutator(ctx android.BottomUpMutatorContext) {
		if ctx.Config().IsEnvTrue("UNSAFE_DISABLE_HIDDENAPI_FLAGS") {
		if ctx.Config().DisableHiddenApiChecks() {
		return
		}

		@@ -275,10 +275,10 @@ func (b *platformBootclasspathModule) generateHiddenAPIBuildActions(ctx android.

		bootDexJarByModule := extractBootDexJarsFromModules(ctx, modules)

		// Don't run any hiddenapi rules if UNSAFE_DISABLE_HIDDENAPI_FLAGS=true. This is a performance
		// Don't run any hiddenapi rules if hidden api checks are disabled. This is a performance
		// optimization that can be used to reduce the incremental build time but as its name suggests it
		// can be unsafe to use, e.g. when the changes affect anything that goes on the bootclasspath.
		if ctx.Config().IsEnvTrue("UNSAFE_DISABLE_HIDDENAPI_FLAGS") {
		if ctx.Config().DisableHiddenApiChecks() {
		paths := android.OutputPaths{b.hiddenAPIFlagsCSV, b.hiddenAPIIndexCSV, b.hiddenAPIMetadataCSV}
		for _, path := range paths {
		ctx.Build(pctx, android.BuildParams{