Merge "Skip initHiddenAPI check of prebuilt's boot dex jar for APEX modules"

java/hiddenapi.go

@@ -156,6 +156,13 @@ func (h *hiddenAPI) initHiddenAPI(ctx android.BaseModuleContext, configurationNa
 
 		// A source module that has been replaced by a prebuilt can never be the primary module.
 		if module.IsReplacedByPrebuilt() {
+			if ctx.HasProvider(android.ApexInfoProvider) {
+				// The source module is in an APEX but the prebuilt module on which it depends is not in an
+				// APEX and so is not the one that will actually be used for hidden API processing. That
+				// means it is not possible to check to see if it is a suitable replacement so just assume
+				// that it is.
+				primary = false
+			} else {
 				ctx.VisitDirectDepsWithTag(android.PrebuiltDepTag, func(prebuilt android.Module) {
 					if h, ok := prebuilt.(hiddenAPIIntf); ok && h.bootDexJar() != nil {
 						primary = false
@@ -168,6 +175,7 @@ func (h *hiddenAPI) initHiddenAPI(ctx android.BaseModuleContext, configurationNa
 				})
 			}
 		}
+	}
 	h.primary = primary
 }