tequilaOS/platform_build_soong
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Disallow platform_compat_config modules in apex prebuilts property

Browse source 
Bug: 182816033
Test: m nothing
Change-Id: I50dcc358e8ae143e21b1fbf1a12835bf1342606f
This commit is contained in:
Paul Duffin 2021-03-15 19:43:17 +00:00
parent 3abc174cfd
commit 1bc21dc7e6
1 changed files with 1 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
apex/apex.go
View file

@ -1746,10 +1746,8 @@ func (a *apexBundle) GenerateAndroidBuildActions(ctx android.ModuleContext) {
case prebuiltTag: case prebuiltTag:
if prebuilt, ok := child.(prebuilt_etc.PrebuiltEtcModule); ok { if prebuilt, ok := child.(prebuilt_etc.PrebuiltEtcModule); ok {
filesInfo = append(filesInfo, apexFileForPrebuiltEtc(ctx, prebuilt, depName)) filesInfo = append(filesInfo, apexFileForPrebuiltEtc(ctx, prebuilt, depName))
} else if prebuilt, ok := child.(java.PlatformCompatConfigIntf); ok {
filesInfo = append(filesInfo, apexFileForCompatConfig(ctx, prebuilt, depName))
} else { } else {
ctx.PropertyErrorf("prebuilts", "%q is not a prebuilt_etc and not a platform_compat_config module", depName) ctx.PropertyErrorf("prebuilts", "%q is not a prebuilt_etc module", depName)
} }
case compatConfigsTag: case compatConfigsTag:
if compatConfig, ok := child.(java.PlatformCompatConfigIntf); ok { if compatConfig, ok := child.(java.PlatformCompatConfigIntf); ok {