From 7cbf5f8e225aaa3151fede8539d1ff512ca89b6f Mon Sep 17 00:00:00 2001 From: Dan Willemsen Date: Tue, 28 Mar 2017 00:08:30 -0700 Subject: [PATCH] Fix variant errors when compiling with the NDK This was corrupting the nonvariants list with the variants list whenever it hit the else case, causing a missing variant issue, since we need to use the variant when linking against lib*.ndk. Test: aosp_arm build.ninja is the same before/after Test: https://android-review.googlesource.com/c/355163/, set BOARD_VNDK_VERSION := current Change-Id: I047937e838464670d0902506871d2203ec8cc17d --- cc/cc.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cc/cc.go b/cc/cc.go index 4c697232e..b27e8eee3 100644 --- a/cc/cc.go +++ b/cc/cc.go @@ -675,7 +675,7 @@ func (c *Module) DepsMutator(actx android.BottomUpMutatorContext) { variantLibs = append(variantLibs, entry+ndkLibrarySuffix) } } else { - nonvariantLibs = append(variantLibs, entry) + nonvariantLibs = append(nonvariantLibs, entry) } } return nonvariantLibs, variantLibs