commit 15e4554049181d0dee583f3659dc6fd263c21435
author Stephen Hines <srhines@google.com> Mon Jul 18 22:08:39 2016 +0000
committer Stephen Hines <srhines@google.com> Mon Jul 18 22:08:39 2016 +0000
tree 761b5a536e373d112176b5b68d4f013713fcc196
parent bb7473dd1a5423c62178d9271ce6a103f08561bd

Revert "Switch libcompiler_rt-extras to LateStaticLibs."

This reverts commit bb7473dd1a5423c62178d9271ce6a103f08561bd.

Change-Id: I6099fd8dadc0213a78cab3e2daef5c5ebd4c31ee

cc/cc.go

diff --git a/cc/cc.go b/cc/cc.go
index 89f40b3..f8723bb 100644
--- a/cc/cc.go
+++ b/cc/cc.go
@@ -1337,7 +1337,7 @@
 	deps.ReexportSharedLibHeaders = append(deps.ReexportSharedLibHeaders, linker.Properties.Export_shared_lib_headers...)
 
 	if !ctx.sdk() && ctx.ModuleName() != "libcompiler_rt-extras" {
-		deps.LateStaticLibs = append(deps.LateStaticLibs, "libcompiler_rt-extras")
+		deps.StaticLibs = append(deps.StaticLibs, "libcompiler_rt-extras")
 	}
 
 	if ctx.Device() {