Remove flto dependent flags when -flto is removed. am: 9e88ba9f22

am: 1cc0227af2

Change-Id: I0670019f95fa9f98cb624801d9bbcd165ca0267b

cc/builder.go

@@ -240,7 +240,8 @@ type builderFlags struct {
 	arFlags         string
 	asFlags         string
 	cFlags          string
-	toolingCFlags  string // A separate set of Cflags for clang LibTooling tools
+	toolingCFlags   string // A separate set of cFlags for clang LibTooling tools
+	toolingCppFlags string // A separate set of cppFlags for clang LibTooling tools
 	conlyFlags      string
 	cppFlags        string
 	ldFlags         string
@@ -330,7 +331,7 @@ func TransformSourceToObj(ctx android.ModuleContext, subdir string, srcFiles and
 	toolingCppflags := strings.Join([]string{
 		commonFlags,
 		flags.toolingCFlags,
-		flags.cppFlags,
+		flags.toolingCppFlags,
 	}, " ")
 
 	cppflags := strings.Join([]string{

cc/config/clang.go

@@ -93,8 +93,10 @@ var ClangUnknownLldflags = sorted([]string{
 })
 
 var ClangLibToolingUnknownCflags = []string{
+	// Remove -flto and other flto dependent flags.
 	"-flto*",
 	"-fsanitize*",
+	"-fwhole-program-vtables",
 }
 
 func init() {

cc/sabi.go

@@ -71,6 +71,7 @@ func (sabimod *sabi) flags(ctx ModuleContext, flags Flags) Flags {
 	// Assuming that the cflags which clang LibTooling tools cannot
 	// understand have not been converted to ninja variables yet.
 	flags.ToolingCFlags = filterOutWithPrefix(flags.CFlags, config.ClangLibToolingUnknownCflags)
+	flags.ToolingCppFlags = filterOutWithPrefix(flags.CppFlags, config.ClangLibToolingUnknownCflags)
 
 	// RSClang does not support recent mcpu option likes exynos-m2.
 	// So we need overriding mcpu option when we want to use it.

cc/util.go

@@ -64,6 +64,7 @@ func flagsToBuilderFlags(in Flags) builderFlags {
 		asFlags:         strings.Join(in.AsFlags, " "),
 		cFlags:          strings.Join(in.CFlags, " "),
 		toolingCFlags:   strings.Join(in.ToolingCFlags, " "),
+		toolingCppFlags: strings.Join(in.ToolingCppFlags, " "),
 		conlyFlags:      strings.Join(in.ConlyFlags, " "),
 		cppFlags:        strings.Join(in.CppFlags, " "),
 		yaccFlags:       strings.Join(in.YaccFlags, " "),