From 07145109fffd6361d79266ef2a8f966d8c53906f Mon Sep 17 00:00:00 2001 From: Spandan Das Date: Mon, 18 Mar 2024 23:25:30 +0000 Subject: [PATCH] Use RELEASE_DISABLE_VERIFY_OVERLAPS_CHECK to disable verify_overlaps This build flag will be used to disable the check when prebuilts are used in internal main. For backwards compatibilty, RELEASE_DEFAULT_MODULE_BUILD_FROM_SOURCE can also be used to disable this check. Test: m nothing Bug: 328200369 Change-Id: I710811995723e75bea9de1ce5c77504f66cbcf45 --- android/config.go | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/android/config.go b/android/config.go index 567ebd83f..10c30d4df 100644 --- a/android/config.go +++ b/android/config.go @@ -168,7 +168,10 @@ func (c Config) DisableHiddenApiChecks() bool { // Thus, verify_overlaps is disabled when RELEASE_DEFAULT_MODULE_BUILD_FROM_SOURCE is set to false. // TODO(b/308174018): Re-enable verify_overlaps for both builr from source/mainline prebuilts. func (c Config) DisableVerifyOverlaps() bool { - return c.IsEnvTrue("DISABLE_VERIFY_OVERLAPS") || !c.ReleaseDefaultModuleBuildFromSource() + if c.IsEnvFalse("DISABLE_VERIFY_OVERLAPS") && c.ReleaseDisableVerifyOverlaps() { + panic("The current release configuration does not support verify_overlaps. DISABLE_VERIFY_OVERLAPS cannot be set to false") + } + return c.IsEnvTrue("DISABLE_VERIFY_OVERLAPS") || c.ReleaseDisableVerifyOverlaps() || !c.ReleaseDefaultModuleBuildFromSource() } // MaxPageSizeSupported returns the max page size supported by the device. This @@ -209,6 +212,10 @@ func (c Config) ReleaseDefaultModuleBuildFromSource() bool { Bool(c.config.productVariables.ReleaseDefaultModuleBuildFromSource) } +func (c Config) ReleaseDisableVerifyOverlaps() bool { + return c.config.productVariables.GetBuildFlagBool("RELEASE_DISABLE_VERIFY_OVERLAPS_CHECK") +} + // Enables flagged apis annotated with READ_WRITE aconfig flags to be included in the stubs // and hiddenapi flags so that they are accessible at runtime func (c Config) ReleaseExportRuntimeApis() bool {