Merge "#apex symbols no longer contribute to platform libraries"

This commit is contained in:
Treehugger Robot
2022-08-19 23:55:00 +00:00
committed by Gerrit Code Review

View File

@@ -1050,9 +1050,7 @@ func (library *libraryDecorator) compile(ctx ModuleContext, flags Flags, deps Pa
if ctx.Module().(android.ApexModule).NotInPlatform() { if ctx.Module().(android.ApexModule).NotInPlatform() {
flag = "--apex" flag = "--apex"
} else { } else {
// TODO(b/239274367) drop --apex when #apex is replaced with #systemapi flag = "--systemapi"
// in the map.txt files of platform libraries
flag = "--systemapi --apex"
} }
nativeAbiResult := parseNativeAbiDefinition(ctx, symbolFile, nativeAbiResult := parseNativeAbiDefinition(ctx, symbolFile,
android.ApiLevelOrPanic(ctx, library.MutatedProperties.StubsVersion), flag) android.ApiLevelOrPanic(ctx, library.MutatedProperties.StubsVersion), flag)