From 4977540bcb20de912acb14fd5443074908ffa512 Mon Sep 17 00:00:00 2001 From: Paul Duffin Date: Fri, 30 Apr 2021 08:58:12 +0100 Subject: 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 --- java/platform_bootclasspath.go | 2 ++ 1 file changed, 2 insertions(+) (limited to 'java/platform_bootclasspath.go') diff --git a/java/platform_bootclasspath.go b/java/platform_bootclasspath.go index 4cb02e3c6..3a5982279 100644 --- a/java/platform_bootclasspath.go +++ b/java/platform_bootclasspath.go @@ -321,6 +321,8 @@ func (b *platformBootclasspathModule) generateHiddenAPIBuildActions(ctx android. } hiddenAPISupportingModules = append(hiddenAPISupportingModules, hiddenAPISupportingModule) + } else if _, ok := module.(*DexImport); ok { + // Ignore this for the purposes of hidden API processing } else { ctx.ModuleErrorf("module %s of type %s does not support hidden API processing", module, ctx.OtherModuleType(module)) } -- cgit v1.2.3-59-g8ed1b