Merge "Extract createEntriesForApexFile" am: e91f1537e2

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

Change-Id: Ide16145fb2292a57917b44377a824fc4c9aa0b89

apex/prebuilt.go

@@ -217,6 +217,15 @@ func (p *prebuiltCommon) AndroidMkEntries() []android.AndroidMkEntries {
 	// apex specific variants of the exported java modules available for use from within make.
 	apexName := p.BaseModuleName()
 	for _, fi := range p.apexFilesForAndroidMk {
+		entries := p.createEntriesForApexFile(fi, apexName)
+		entriesList = append(entriesList, entries)
+	}
+
+	return entriesList
+}
+
+// createEntriesForApexFile creates an AndroidMkEntries for the supplied apexFile
+func (p *prebuiltCommon) createEntriesForApexFile(fi apexFile, apexName string) android.AndroidMkEntries {
 	moduleName := fi.androidMkModuleName + "." + apexName
 	entries := android.AndroidMkEntries{
 		Class:        fi.class.nameInMake(),
@@ -256,11 +265,7 @@ func (p *prebuiltCommon) AndroidMkEntries() []android.AndroidMkEntries {
 			},
 		},
 	}
-
-		entriesList = append(entriesList, entries)
-	}
-
-	return entriesList
+	return entries
 }
 
 // prebuiltApexModuleCreator defines the methods that need to be implemented by prebuilt_apex and