Updates from make
Contains equivalent changes for:
561b4c1 Set mcpu targets based on cpu variant.
6a66a88 Stop encoding absolute paths in symbols
63e3b02 Enable color output from gcc and clang
eb3e3fa Use exported includes for libc++.
3a0a891 Link libgtest_main before libgtest
Change-Id: I45a06c02e9af1d40f0c52f1e6a20d6cd382a27fb
diff --git a/cc/cc.go b/cc/cc.go
index 147559e..2278ec0 100644
--- a/cc/cc.go
+++ b/cc/cc.go
@@ -79,6 +79,8 @@
"-Wno-unused",
"-Winit-self",
"-Wpointer-arith",
+ "-fdiagnostics-color",
+ "-fdebug-prefix-map=/proc/self/cwd=",
// COMMON_RELEASE_CFLAGS
"-DNDEBUG",
@@ -838,7 +840,6 @@
switch stl {
case "libc++", "libc++_static":
flags.CFlags = append(flags.CFlags, "-D_USING_LIBCXX")
- flags.CFlags = append(flags.CFlags, "-I${SrcDir}/external/libcxx/include")
if ctx.Host() {
flags.CppFlags = append(flags.CppFlags, "-nostdinc++")
flags.LdFlags = append(flags.LdFlags, "-nodefaultlibs")
@@ -1551,7 +1552,7 @@
}
func (c *CCTest) depNames(ctx common.AndroidBaseContext, depNames CCDeps) CCDeps {
- depNames.StaticLibs = append(depNames.StaticLibs, "libgtest", "libgtest_main")
+ depNames.StaticLibs = append(depNames.StaticLibs, "libgtest_main", "libgtest")
depNames = c.CCBinary.depNames(ctx, depNames)
return depNames
}