commit 9516ee9556f7ebc1bd9c5adb836eea2268a09392
author Inseob Kim <inseob@google.com> Thu May 09 10:56:13 2019 +0900
committer Inseob Kim <inseob@google.com> Thu May 09 12:29:58 2019 +0900
tree b6d981f9006c62173769afc3d5e1b110155cac58
parent ffff95bc4e22f22ab973951af6403da77284fbca

Attach global variables to Context

Global variables make testing difficult, and they should attached to
Context.

Bug: N/A
Test: m
Change-Id: Ic671dda755e99d036c7ddce0eed114496374d7ec

cc/sanitize.go

diff --git a/cc/sanitize.go b/cc/sanitize.go
index 2d80c22..acf2bef 100644
--- a/cc/sanitize.go
+++ b/cc/sanitize.go
@@ -817,7 +817,7 @@
 		}
 
 		if mctx.Device() && runtimeLibrary != "" {
-			if inList(runtimeLibrary, llndkLibraries) && !c.static() && c.useVndk() {
+			if inList(runtimeLibrary, *llndkLibraries(mctx.Config())) && !c.static() && c.useVndk() {
 				runtimeLibrary = runtimeLibrary + llndkLibrarySuffix
 			}