commit 61b66e9b34cfe353f9f93fbd3aaa5af0219fb079
author Jooyung Han <jooyung@google.com> Sat Mar 21 14:21:46 2020 +0000
committer Jooyung Han <jooyung@google.com> Sat Mar 21 23:23:14 2020 +0900
tree ab38eb33f93f3fcb639d32bb338d88ae95fab7bd
parent b1eb4d4a94be315b1907c0ef4b38f0ada546efd0

Revert "Revert "Enforce min_sdk_version of apex(use_vendor:true)""

This reverts commit bacf34d986011a37dc45ebbd59d464950cd7574d.

Reason for revert: reland with fix

Change-Id: Ia03f2808353f5640597ae7ecbf2e06fc903c6977

cc/vndk.go

diff --git a/cc/vndk.go b/cc/vndk.go
index e02e7b5..4888dcf 100644
--- a/cc/vndk.go
+++ b/cc/vndk.go
@@ -297,6 +297,9 @@
 	if !Bool(lib.Properties.Vendor_available) {
 		vndkPrivateLibraries(mctx.Config())[name] = filename
 	}
+	if mctx.OtherModuleExists(name) {
+		mctx.AddFarVariationDependencies(m.Target().Variations(), llndkImplDep, name)
+	}
 }
 
 func processVndkLibrary(mctx android.BottomUpMutatorContext, m *Module) {