commit 7d6e79bc63b6431ae19f7a833905a06ede6d948d
author Jooyung Han <jooyung@google.com> Thu Jun 24 01:53:43 2021 +0900
committer Jooyung Han <jooyung@google.com> Thu Jun 24 01:56:03 2021 +0900
tree 4b3c2e3ea8eb2ddb2a53bc6d75727ae17f97c457
parent 2afa8915bb32e43c1f59240d44740e2dcbfb8235

VNDK APEX: skips VNDK-Ext

In legacy VNDK mode (DeviceVndkVesion=""), the check was missing. We
don't want VNDK-Ext in VNDK APEX in any case.

Bug: 191770320
Test: m nothing
Change-Id: I08f36a4c1696bf82d25d629841e172d2716a366d

cc/vndk.go

diff --git a/cc/vndk.go b/cc/vndk.go
index dd1c3e1..0b40076 100644
--- a/cc/vndk.go
+++ b/cc/vndk.go
@@ -371,7 +371,7 @@
 			if mctx.ModuleName() == "libz" {
 				return false
 			}
-			return m.ImageVariation().Variation == android.CoreVariation && lib.shared() && m.IsVndkSp()
+			return m.ImageVariation().Variation == android.CoreVariation && lib.shared() && m.IsVndkSp() && !m.IsVndkExt()
 		}
 
 		useCoreVariant := m.VndkVersion() == mctx.DeviceConfig().PlatformVndkVersion() &&