Support dex_import on platform_bootclasspath

Maintain compatibility with previous behavior by ignoring dex_import
during hidden API processing.

Bug: 179354495
Test: m nothing
Change-Id: I976b02129bf981b7b61dce233567d6f89e04f92d
This commit is contained in:
Paul Duffin
2021-04-30 08:58:12 +01:00
parent ee4e7fe76f
commit 4977540bcb
2 changed files with 19 additions and 0 deletions

View File

@@ -321,6 +321,8 @@ func (b *platformBootclasspathModule) generateHiddenAPIBuildActions(ctx android.
} }
hiddenAPISupportingModules = append(hiddenAPISupportingModules, hiddenAPISupportingModule) hiddenAPISupportingModules = append(hiddenAPISupportingModules, hiddenAPISupportingModule)
} else if _, ok := module.(*DexImport); ok {
// Ignore this for the purposes of hidden API processing
} else { } else {
ctx.ModuleErrorf("module %s of type %s does not support hidden API processing", module, ctx.OtherModuleType(module)) ctx.ModuleErrorf("module %s of type %s does not support hidden API processing", module, ctx.OtherModuleType(module))
} }

View File

@@ -133,6 +133,23 @@ func TestPlatformBootclasspath(t *testing.T) {
"platform:bar", "platform:bar",
}) })
}) })
t.Run("dex import", func(t *testing.T) {
result := android.GroupFixturePreparers(
preparer,
android.FixtureAddTextFile("deximport/Android.bp", `
dex_import {
name: "foo",
jars: ["a.jar"],
}
`),
).RunTest(t)
CheckPlatformBootclasspathModules(t, result, "platform-bootclasspath", []string{
"platform:prebuilt_foo",
"platform:bar",
})
})
} }
func TestPlatformBootclasspath_Fragments(t *testing.T) { func TestPlatformBootclasspath_Fragments(t *testing.T) {