commit 12bd7c7538ebef4773f74f4854c60ec4d8b40dda
author Treehugger Robot <treehugger-gerrit@google.com> Fri Aug 19 23:55:00 2022 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Aug 19 23:55:00 2022 +0000
tree 3de61ee95a5509482507eaed32c022f27673152a
parent b6056794409a30021acfe595aeb5ac61517a75e2
parent ffea9b3b0e84286879327b73026d8cc3e34042d2

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

cc/library.go

diff --git a/cc/library.go b/cc/library.go
index c3c587d..621b58c 100644
--- a/cc/library.go
+++ b/cc/library.go
@@ -1050,9 +1050,7 @@
 		if ctx.Module().(android.ApexModule).NotInPlatform() {
 			flag = "--apex"
 		} else {
-			// TODO(b/239274367) drop --apex when #apex is replaced with #systemapi
-			// in the map.txt files of platform libraries
-			flag = "--systemapi --apex"
+			flag = "--systemapi"
 		}
 		nativeAbiResult := parseNativeAbiDefinition(ctx, symbolFile,
 			android.ApiLevelOrPanic(ctx, library.MutatedProperties.StubsVersion), flag)