From 7daf2786b69de813213e8bba0b449ea2cc7cf47f Mon Sep 17 00:00:00 2001 From: Alyssa Ketpreechasawat Date: Wed, 1 Nov 2023 13:58:39 +0000 Subject: Disable verify_overlaps test instead of hiddenapi check. Disabling hiddenapi check entirely can be dangerous and it might change the accessibility of @hide Api too. We should only disable verify_overlaps test which is required for module_sdk and apexes mismatch. Test: atest CtsInlineMockingTestCases Bug: 308187068 Bug: 307480026 Change-Id: I44f48e85d802b3a8f2711bc2047bdab721369f08 --- java/hiddenapi_modular.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'java/hiddenapi_modular.go') diff --git a/java/hiddenapi_modular.go b/java/hiddenapi_modular.go index 81be33dd1..fbc0197d6 100644 --- a/java/hiddenapi_modular.go +++ b/java/hiddenapi_modular.go @@ -358,7 +358,7 @@ func buildRuleToGenerateHiddenAPIStubFlagsFile(ctx android.BuilderContext, name, // If there are stub flag files that have been generated by fragments on which this depends then // use them to validate the stub flag file generated by the rules created by this method. - if len(stubFlagSubsets) > 0 { + if !ctx.Config().DisableVerifyOverlaps() && len(stubFlagSubsets) > 0 { validFile := buildRuleValidateOverlappingCsvFiles(ctx, name, desc, outputPath, stubFlagSubsets, HIDDENAPI_STUB_FLAGS_IMPL_FLAGS) @@ -1006,7 +1006,7 @@ func buildRuleToGenerateHiddenApiFlags(ctx android.BuilderContext, name, desc st // If there are flag files that have been generated by fragments on which this depends then use // them to validate the flag file generated by the rules created by this method. - if len(flagSubsets) > 0 { + if !ctx.Config().DisableVerifyOverlaps() && len(flagSubsets) > 0 { validFile := buildRuleValidateOverlappingCsvFiles(ctx, name, desc, outputPath, flagSubsets, HIDDENAPI_FLAGS_CSV_IMPL_FLAGS) -- cgit v1.2.3-59-g8ed1b