From 1bc21dc7e671b05bc71d70a3fca8e08a80dbac8b Mon Sep 17 00:00:00 2001 From: Paul Duffin Date: Mon, 15 Mar 2021 19:43:17 +0000 Subject: [PATCH] Disallow platform_compat_config modules in apex prebuilts property Bug: 182816033 Test: m nothing Change-Id: I50dcc358e8ae143e21b1fbf1a12835bf1342606f --- apex/apex.go | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/apex/apex.go b/apex/apex.go index f66da1d07..62dd3b644 100644 --- a/apex/apex.go +++ b/apex/apex.go @@ -1746,10 +1746,8 @@ func (a *apexBundle) GenerateAndroidBuildActions(ctx android.ModuleContext) { case prebuiltTag: if prebuilt, ok := child.(prebuilt_etc.PrebuiltEtcModule); ok { filesInfo = append(filesInfo, apexFileForPrebuiltEtc(ctx, prebuilt, depName)) - } else if prebuilt, ok := child.(java.PlatformCompatConfigIntf); ok { - filesInfo = append(filesInfo, apexFileForCompatConfig(ctx, prebuilt, depName)) } 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: if compatConfig, ok := child.(java.PlatformCompatConfigIntf); ok {