Merge "Cleanup bootclasspathFragmentInitContentsFromImage" am: 909a2fd055

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

Change-Id: Id717912bdc2b89154ab8a2a44d1e15b26010f6ee
This commit is contained in:
Paul Duffin
2021-06-17 16:22:59 +00:00
committed by Automerger Merge Worker

View File

@@ -233,14 +233,6 @@ func bootclasspathFragmentInitContentsFromImage(ctx android.EarlyModuleContext,
commonApex, apex)
}
}
if len(contents) != 0 {
// Nothing to do.
return
}
// Store the jars in the Contents property so that they can be used to add dependencies.
m.properties.Contents = modules.CopyOfJars()
}
// bootclasspathImageNameContentsConsistencyCheck checks that the configuration that applies to this