commit ffea9b3b0e84286879327b73026d8cc3e34042d2
author Jiyong Park <jiyong@google.com> Sun Jul 17 17:32:56 2022 +0900
committer Jiyong Park <jiyong@google.com> Tue Jul 19 13:47:19 2022 +0900
tree 00aadd9a83f4fe0358baa401790c7460c65a8e82
parent 85cc35a14380578105f02d6fb60547d58c7ad1dc

`#apex` symbols no longer contribute to platform libraries

Bug: 239274367
Test: m
Change-Id: I7a6cd0f46071d5dbbf9510df5693a0d6b95e10c0

cc/library.go

diff --git a/cc/library.go b/cc/library.go
index e2d5ef6..443d6d0 100644
--- a/cc/library.go
+++ b/cc/library.go
@@ -1039,9 +1039,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)