Merge "Add --no-force-assign-all for java_sdk_library" into rvc-dev

This commit is contained in:
TreeHugger Robot
2020-05-19 23:08:47 +00:00
committed by Android (Google) Code Review

View File

@@ -180,7 +180,9 @@ func hiddenAPIEncodeDex(ctx android.ModuleContext, output android.WritablePath,
// b/149353192: when a module is instrumented, jacoco adds synthetic members // b/149353192: when a module is instrumented, jacoco adds synthetic members
// $jacocoData and $jacocoInit. Since they don't exist when building the hidden API flags, // $jacocoData and $jacocoInit. Since they don't exist when building the hidden API flags,
// don't complain when we don't find hidden API flags for the synthetic members. // don't complain when we don't find hidden API flags for the synthetic members.
if j, ok := ctx.Module().(*Library); ok && j.shouldInstrument(ctx) { if j, ok := ctx.Module().(interface {
shouldInstrument(android.BaseModuleContext) bool
}); ok && j.shouldInstrument(ctx) {
enforceHiddenApiFlagsToAllMembers = false enforceHiddenApiFlagsToAllMembers = false
} }