StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add deapexer support for apex_set" am: d137306c16 am: ada746ce26 am: 6a98d68960

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

Change-Id: I17e1e7feb52eb2b162b94f4e31fa3fc777dd5bf0
This commit is contained in:
Paul Duffin
2021-04-08 21:55:44 +00:00
committed by Automerger Merge Worker
parent c117d629ab 6a98d68960
commit be455a29b5
2 changed files with 48 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
apex/prebuilt.go
View File

@@ -664,7 +664,7 @@ func (a *ApexSet) Overrides() []string {
// prebuilt_apex imports an `.apex` file into the build graph as if it was built with apex.
func apexSetFactory() android.Module {
module := &ApexSet{}
module.AddProperties(&module.properties, &module.selectedApexProperties)
module.AddProperties(&module.properties, &module.selectedApexProperties, &module.deapexerProperties)
android.InitSingleSourcePrebuiltModule(module, &module.selectedApexProperties, "Selected_apex")
android.InitAndroidMultiTargetsArchModule(module, android.DeviceSupported, android.MultilibCommon)
@@ -676,6 +676,9 @@ func apexSetFactory() android.Module {
createApexExtractorModule(ctx, apexExtractorModuleName, &module.properties.ApexExtractorProperties)
apexFileSource := ":" + apexExtractorModuleName
if len(module.deapexerProperties.Exported_java_libs) != 0 {
createDeapexerModule(ctx, deapexerModuleName(baseModuleName), apexFileSource, &module.deapexerProperties)
}
// After passing the arch specific src properties to the creating the apex selector module
module.selectedApexProperties.Selected_apex = proptools.StringPtr(apexFileSource)
@@ -701,6 +704,16 @@ func apexExtractorModuleName(baseModuleName string) string {
return baseModuleName + ".apex.extractor"
}
func (a *ApexSet) DepsMutator(ctx android.BottomUpMutatorContext) {
a.deapexerDeps(ctx)
}
var _ ApexInfoMutator = (*ApexSet)(nil)
func (a *ApexSet) ApexInfoMutator(mctx android.TopDownMutatorContext) {
a.apexInfoMutator(mctx)
}
func (a *ApexSet) GenerateAndroidBuildActions(ctx android.ModuleContext) {
a.installFilename = a.InstallFilename()
if !strings.HasSuffix(a.installFilename, imageApexSuffix) {