commit 7b6118be6b3504df2092d4099067b8495a029873
author Jeff Gaston <jeffrygaston@google.com> Wed Oct 04 21:07:42 2017 +0000
committer Jeff Gaston <jeffrygaston@google.com> Wed Oct 04 21:07:42 2017 +0000
tree ccbd32b37d2e8606bc68be56edaccdc7bb54a3cf
parent 2370af0e239555d891ef4fffd5597384c947f62e

Revert "Some clarifications in preparation to automatically order linker dependencies"

This reverts commit 2370af0e239555d891ef4fffd5597384c947f62e.

Reason for revert: New Build Breakage: aosp-master/aosp_arm64_ab-userdebug @ 4376965

Change-Id: Ibe4b819c4292457c454bf42e6d94fba3071ec04b

cc/sabi.go

diff --git a/cc/sabi.go b/cc/sabi.go
index 8086f5b..e45b040 100644
--- a/cc/sabi.go
+++ b/cc/sabi.go
@@ -79,7 +79,7 @@
 
 func sabiDepsMutator(mctx android.TopDownMutatorContext) {
 	if c, ok := mctx.Module().(*Module); ok &&
-		((c.isVndk() && c.useVndk()) || inList(c.Name(), llndkLibraries) ||
+		((c.isVndk() && c.vndk()) || inList(c.Name(), llndkLibraries) ||
 			(c.sabi != nil && c.sabi.Properties.CreateSAbiDumps)) {
 		mctx.VisitDirectDeps(func(m blueprint.Module) {
 			tag := mctx.OtherModuleDependencyTag(m)