Merge "Allow hiddenapi list to ignore missing classes/members" am: 9e4a27840b

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1747553

Change-Id: I139cd63e4ec08ccf6ee6e6067c1768ce67a408b4
This commit is contained in:
Paul Duffin
2021-06-28 11:16:12 +00:00
committed by Automerger Merge Worker

View File

@@ -316,6 +316,13 @@ func buildRuleToGenerateHiddenAPIStubFlagsFile(ctx android.BuilderContext, name,
FlagForEachInput("--dependency-stub-dex=", dependencyStubDexJars).
FlagForEachInput("--boot-dex=", bootDexJars)
// If no module stub flags paths are provided then this must be being called for a
// bootclasspath_fragment and not the whole platform_bootclasspath.
if moduleStubFlagsPaths == nil {
// This is being run on a fragment of the bootclasspath.
command.Flag("--fragment")
}
// Iterate over the api scopes in a fixed order.
for _, apiScope := range hiddenAPIFlagScopes {
// Merge in the stub dex jar paths for this api scope from the fragments on which it depends.