commit 2973c1106fc92216e208d5096bd69414a7f13ca4
author Lorenzo Colitti <lorenzo@google.com> Wed Dec 18 00:15:07 2019 +0000
committer Lorenzo Colitti <lorenzo@google.com> Wed Dec 18 00:15:07 2019 +0000
tree c0ed554f5cffc203c13168e4662044552808dec6
parent 6f907ad3ddad9eb0e928ff7ad7965fa17a8a6946

Revert "Also package recursive jni_libs deps of android_apps as well as direct deps."

This reverts commit 6f907ad3ddad9eb0e928ff7ad7965fa17a8a6946.

Reason for revert: Broke FrameworksNetSmokeTests

Bug: 146456945
Change-Id: Ibef7bb80c532e70cfcfb974f51a99ed25437a343

cc/sabi.go

diff --git a/cc/sabi.go b/cc/sabi.go
index 7c9c651..8cef170 100644
--- a/cc/sabi.go
+++ b/cc/sabi.go
@@ -80,7 +80,7 @@
 
 func sabiDepsMutator(mctx android.TopDownMutatorContext) {
 	if c, ok := mctx.Module().(*Module); ok &&
-		((c.IsVndk() && c.UseVndk()) || c.IsLlndk(mctx.Config()) ||
+		((c.IsVndk() && c.UseVndk()) || c.isLlndk(mctx.Config()) ||
 			(c.sabi != nil && c.sabi.Properties.CreateSAbiDumps)) {
 		mctx.VisitDirectDeps(func(m android.Module) {
 			tag := mctx.OtherModuleDependencyTag(m)