diff options
| author | 2023-11-06 10:53:31 +0000 | |
|---|---|---|
| committer | 2023-11-06 10:53:31 +0000 | |
| commit | 98e555c842a8dfc93269f078451afb47a268502d (patch) | |
| tree | b3740f49aa75c62576ab063d86e0f748062d1b77 /java/hiddenapi_modular.go | |
| parent | 74639be8a789d9a3e9683bc961686b5cdec261f7 (diff) | |
| parent | 7daf2786b69de813213e8bba0b449ea2cc7cf47f (diff) | |
Merge "Disable verify_overlaps test instead of hiddenapi check." into main
Diffstat (limited to 'java/hiddenapi_modular.go')
| -rw-r--r-- | java/hiddenapi_modular.go | 4 |
1 files changed, 2 insertions, 2 deletions
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) |