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

Commit 95497dc8 authored by Yu Liu's avatar Yu Liu
Browse files

Allow cfi enabled modules in mixed build. 

Bug: None
Test: Locally tested
Change-Id: I53c4ad8428cf05ceee3d73b4f97c2b9db2285c38
parent 331c7d77

cc/cc.go

+2 −1
Original line number Diff line number Diff line
@@ -1916,7 +1916,6 @@ func allEnabledSanitizersSupportedByBazel(c *Module) bool { 


	unsupportedSanitizers := []*bool{

		sanitizeProps.Safestack,

		sanitizeProps.Cfi,

		sanitizeProps.Scudo,

		BoolPtr(len(c.sanitize.Properties.Sanitize.Recover) > 0),

		BoolPtr(c.sanitize.Properties.Sanitize.Blocklist != nil),
@@ -1935,6 +1934,8 @@ func allEnabledSanitizersSupportedByBazel(c *Module) bool { 
			if ubsanEnabled && !c.MinimalRuntimeNeeded() {

				return false

			}

		} else if san == cfi {

			continue

		} else if c.sanitize.isSanitizerEnabled(san) {

			return false

		}

cc/cc_test.go

+1 −1
Original line number Diff line number Diff line
@@ -5538,7 +5538,7 @@ func TestDisableSanitizerVariantsInMixedBuilds(t *testing.T) { 
			name:    "foo_cfi",

			variant: "android_arm64_armv8-a_static_cfi_apex28",

			expectedOutputPaths: []string{

				"out/soong/.intermediates/foo_cfi/android_arm64_armv8-a_static_cfi_apex28/foo_cfi.a",

				"outputbase/execroot/__main__/foo_cfi.a",

			},

		},

		{