commit a427e814f07d071b4a3c31976a7701b4f80546b5
author android-build-team Robot <android-build-team-robot@google.com> Mon Jun 18 23:34:53 2018 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Mon Jun 18 23:34:53 2018 +0000
tree 0389234c7461d39dc7d89dd521d1df2e66f09900
parent ba27e13355e235cea24c0f16f3f5bb23e6dfd88a
parent 8f303934e89b89fd2aad31defe606e0a74138ae1

Merge cherrypicks of [4368877, 4369031, 4369032, 4369033, 4369034, 4368878, 4369035, 4369036, 4369008] into pi-release

Change-Id: I758bc94b92ca72e194430c56a45615b71a8c39ab

cc/cc.go

diff --git a/cc/cc.go b/cc/cc.go
index ca3f872..51ac184 100644
--- a/cc/cc.go
+++ b/cc/cc.go
@@ -546,7 +546,7 @@
 		isVariantOnProductionDevice = sanitize.isVariantOnProductionDevice()
 	}
 	vendorAvailable := Bool(ctx.mod.VendorProperties.Vendor_available)
-	return !skipAbiChecks && isVariantOnProductionDevice && ctx.ctx.Device() && ((ctx.useVndk() && ctx.isVndk() && vendorAvailable) || inList(ctx.baseModuleName(), llndkLibraries))
+	return !skipAbiChecks && isVariantOnProductionDevice && ctx.ctx.Device() && ((ctx.useVndk() && ctx.isVndk() && (vendorAvailable || ctx.isVndkExt())) || inList(ctx.baseModuleName(), llndkLibraries))
 }
 
 func (ctx *moduleContextImpl) selectedStl() string {