Merge "Extract createEntriesForApexFile" into sc-dev (1970d6c5) · Commits · e / os / android_build_soong

apex/prebuilt.go

+45 −40

Original line number	Diff line number	Diff line
		@@ -216,6 +216,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(),
		@@ -255,11 +264,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