Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a9ccbb7b authored by Kevin Rocard's avatar Kevin Rocard
Browse files

Revert "Add external projects only CFlags option" 

This reverts commit 6a350878.

Reason for revert: Breakage of many AOSP targets

Change-Id: I917e6daa04ac02ecb98c7bb1816f9bdaf46429f5
parent 6a350878

cc/compiler.go

+0 −6
Original line number Diff line number Diff line
@@ -392,12 +392,6 @@ func (compiler *baseCompiler) compilerFlags(ctx ModuleContext, flags Flags, deps 
			fmt.Sprintf("${config.%sGlobalCflags}", hod))

	}



	if flags.Clang {

		if strings.HasPrefix(android.PathForModuleSrc(ctx).String(), "external/") {

			flags.GlobalFlags = append([]string{"${config.ClangExternalCflags}"}, flags.GlobalFlags...)

		}

	}



	if ctx.Device() {

		if Bool(compiler.Properties.Rtti) {

			flags.CppFlags = append(flags.CppFlags, "-frtti")

cc/config/clang.go

+4 −7
Original line number Diff line number Diff line
@@ -173,17 +173,14 @@ func init() { 
		// this new warning are fixed.

		"-Wno-null-pointer-arithmetic",



		// Disable c++98-specific warning since Android is not concerned with C++98

		// compatibility.

		"-Wno-c++98-compat-extra-semi",

	}, " "))



	// Extra cflags for projects under external/ directory

	pctx.StaticVariable("ClangExtraExternalCflags", strings.Join([]string{

		// http://b/72330874 Disable -Wenum-compare until the instances detected by this new

		// warning are fixed.

		"-Wno-enum-compare",

		"-Wno-enum-compare-switch",



		// Disable c++98-specific warning since Android is not concerned with C++98

		// compatibility.

		"-Wno-c++98-compat-extra-semi",

	}, " "))

}

cc/config/global.go

+0 −2
Original line number Diff line number Diff line
@@ -170,8 +170,6 @@ func init() { 
	pctx.StaticVariable("CommonClangGlobalCppflags",

		strings.Join(append(ClangFilterUnknownCflags(commonGlobalCppflags), "${ClangExtraCppflags}"), " "))



	pctx.StaticVariable("ClangExternalCflags", "${ClangExtraExternalCflags}")



	// Everything in these lists is a crime against abstraction and dependency tracking.

	// Do not add anything to this list.

	pctx.PrefixedExistentPathsForSourcesVariable("CommonGlobalIncludes", "-I",