From 360f8359f3c853d168db609e300e505a93d50c4d Mon Sep 17 00:00:00 2001 From: Paul Duffin Date: Mon, 7 Jun 2021 19:34:01 +0100 Subject: [PATCH] Cleanup bootclasspathFragmentInitContentsFromImage Removes some unnecessary logic left over from previous changes. Bug: 177892522 Test: m nothing Merged-In: Id11e2ea8a647283af1b152b33757132e44dcd6c3 Change-Id: Id11e2ea8a647283af1b152b33757132e44dcd6c3 (cherry picked from commit 58e7586b3d8fffa63b869c421a36c69fdd30a264) --- java/bootclasspath_fragment.go | 8 -------- 1 file changed, 8 deletions(-) diff --git a/java/bootclasspath_fragment.go b/java/bootclasspath_fragment.go index fecf8931f..c47ab3854 100644 --- a/java/bootclasspath_fragment.go +++ b/java/bootclasspath_fragment.go @@ -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